Merge branch 'master' into PHOT-80