Updates from to the T&C and a load of old pull request merges