Merge commit 'aa12ad5d85a62a79810cc946994b311e62dc4f00' into MR3.0-Merge-v2.0-ZK

Change-Id: Ia8c9ef06432e4dbf0ec459d278441a1740333a2d