Merge branch 'hotfix/test4'

Change-Id: I2d8b2dbc39c349d693c5087d7e81c1bc311073c6