Merge branch 'revert-67cc4dce' into 'develop'