Merge branch 'hotfix/test5'

Change-Id: Ie5d17cc511514c8284a34b7c3e02b8d1eb1ad507
Merge branch 'master' into develop

Change-Id: I203a097d9df06febe2531656a9c85ece83b593e5