Merge branch 'revert-d31bbb1c' into 'develop'