Merging PrimaryHost feature branch into trunk.
Authored by: i-campbell 2021-02-12
Parent: [r755]
Child: [r757]