More Updates

As we get closer to release-ready, pulling in the updates from the staging branch.