Staging - rebase

Rebase staging to match master for new development workflow.