Revert "Revert "Revert "Revert "Revert "Merge branch 'pre-release'"""""

This reverts commit e7a51f3d98d699cc7c3571a37c2196523b23b7b1.