Code-collab fixups.
Merging origin/goliver/master-pending-cc-fixups into master