Committing one section of pull request from PhonicUK: Commit 9558226.