Photon added
Merge branch 'origin/Hans'