Follow-on to #2475 to fixup compile/test issues CTR
7 files changed