Merge branch 'partev-develop-patch-72837' into 'develop'