CI Server build optimization, experiment branch, don't merge yet