Merge "[526972] Update setups for Photon"