Merge branch 'revert-4d3655c4' into 'develop'