7 1 x photon

This is forward port to 71X from #4330.