I will admin-merge this PR on the basis that #809 has already been reviewed and approved. Also see #810 which adds unit tests to further validate the changes.
[x] I have considered if this change warrants release notes and have added them to the appropriate section in the CHANGELOG.md if necessary.
Cherry pick changes from #809 into
release/7.3.1I will admin-merge this PR on the basis that #809 has already been reviewed and approved. Also see #810 which adds unit tests to further validate the changes.
CHANGELOG.mdif necessary.