Port changes from the release branch back to main

[damonbarry]

I found two changes in the release branch that are not found in main:

• 6743 was ported from release/1.1

• 6807 originated in the release branch