abc-9

Change-Id: I771a99a2a9ec420ed3d82943c27d94fde91bc4bb
Merge branch 'hotfix/4.2.2' into develop