Reviewed by TPO for release

The current dev branch has been fully reviewed by TPO. It is being merged into master to prepare for a release.