Merge staging to master

Merging changes from staging to master for today's deployment,