Merge branch 'revert-13a7105b' into 'develop'