Merge commit 'c4855e2e520c1f40ce7fe996302ca70a1e1fd5f0' into MR3.0-Merge-v2.0

Change-Id: I09327c49ba8d57bd2d43a90f5d5b76ee6559b7a5