Merge branch 'hotfix/test2'

Change-Id: I33c07de5f4fcb836a611daffbfd864f0f99a57f5