Compilation time reduction and housekeeping

mjrequested to merge
mj/ccs-proposals:compil-time-reduction-and-housekeeping into master

Merge request reports