Merge branch 'revert-3fee859b' into 'develop'