Final revisions made prior to TP. See bitbucket for more detailed commit messages.