Merge updates to stable

These updates are pretty stable and have not caused any issues so for.