This backports the comps-sync changes from master and then performs a comps sync like #77.
Pull-Request has been merged by walters
This backports the comps-sync changes from master and then performs a comps sync like #77.