Merge "[Papyrus] Update papyrus contribution for Photon M4"