Merge "[Papyrus] Update Papyrus contribution for Photon M2"