Merge branch 'revert-83508418' into 'develop'