Merge branch 'PHOT-80'