Merge "Tidy up changes before API change"