Merge branch 'dkuku-develop-patch-66061' into 'develop'