Release v2.0: Review commits not cherry-picked from `develop`

[awana-release-bot]

The release candidate branch rc/v2.0 was merged with release/v2.x with commits that are not on the develop branch. Please review each commit below and check it can either be ignored or has been applied to the develop branch. You can close this issue when all commits are reviewed.

• 14de441 non-cherry-pick commit

[gmaclennan]

Not applicable, doesn't need to be on develop