Merge staging into master

Update master with staging updates.