Update 2.1.x release branch for 2.1.5
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.5 release:
- #1521
- #1523
- #1530
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.5 release: