reloading bug fix
Merge branch 'master' into PHOT-22