Update 3.0.x release branch for 3.0.4
This PR cherry picks the changes from the following PRs onto the release/3.0.x branch to finalise the 3.0.4 release:
- #1606
This PR cherry picks the changes from the following PRs onto the release/3.0.x branch to finalise the 3.0.4 release: