NOT FOR REVIEW! EXPERIMENTAL CHANGES!
Opening MR to try and use CI to discover client compilation needs.