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