Merge "Updated VIATRA for Photon"