global: master to next integration

* Provides changes need after #1765 is merged.