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

Change-Id: If6c55a1c5f519dd315f255ac0bdd8e3530ea40cf