Merge branch 'removing-deprecated' into 'develop'