change on hotfix

Change-Id: I293ddd7d809cc73d92f67fb4ed9857d7d545b558
Merge branch 'hotfix/4.2.3' into develop