Merge branch 'revert-5c6c3026' into 'develop'