Update 3.0.x release branch for 3.0.1

This PR merges the changes from the following PRs onto the release/3.0.x branch to finalise the 3.0.1 release:

• #1547
• #1553
• #1554
• #1556
• #1558