Merge branch 'revert-bca1512d' into 'develop'