Merge branch 'develop' into hotfix/8.1.1

Change-Id: Id0181c98ad11bee764c3729436ddc6067f7eefad