Merge branch 'remove-swift' into 'develop'