Merge "[533741] Add support for photon"