Merge branch 'global-qbx' into photonics