Merge branch 'photonics' into 'master'