sunk primaryhost in order to start fresh from trunk (upmerge went south bad)
Authored by: hermsen 2021-03-06
Parent: [r811]
Child: [r813]