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

Change-Id: I87e8326f92bd12dfece3ff32b2eb30c6e1dbec2b