Merge remote-tracking branch 'M1cha/photosphere/master'

- Resolved conflicts (from those cherry-picked commits of 'markembling/photosphere') and merged with latest commit from M1cha/photosphere@9faeb707dba70add53dd62e9c8f88db7b245509d