fix issue with FILT PHOT scattering
Merge branch 'master' into develop