Merge "Trace Compass contribution to Photon RC4 build"