Merge branch 'revert-60cc7d6c' into 'develop'