Merge release into master

Merged release into locally and pushed this branch for tests