Update 2.1.x release branch for 2.1.2
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.2 release:
- #1411
- #1423
- #1425
- #1433
- #1435
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.2 release: