Merge commit '4b8f7b107efc3fed344bbeb3fafe56836883d6b5' into MR3.0-Merge-v2.0-ZK

Change-Id: I5cc96bd129cf3a67df59205b3543a0c4ec51cc59