Update 2.1.x release branch for 2.1.3
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.3 release:
- #1439
- #1438
- #1434
- #1418
- #1457
- #1458
- #1401
- #1456
- #1402
- #1440
This PR merges the changes from the following PRs onto the release/2.1.x branch to finalise the 2.1.3 release: