Merge commit '7920ec8b2fc8f3ff84364a2d134a369e42187771' into MR3.0-Merge-v2.0-ZK

Change-Id: I712201b4da4feef12beaad859c3f3da78e9e0726