Update 2.0.x release branch for 2.0.4
This PR cherry picks the changes from the following PRs onto the release/2.0.x branch to finalise the 2.0.4 release
- #1304
- #1310
- #1320
- #1318
- #1317
- #1305
- #1319
This PR cherry picks the changes from the following PRs onto the release/2.0.x branch to finalise the 2.0.4 release