Merge branch 'remove-unused-aliases' into 'develop'