Merge branch 'Zeke' into robert
Fix base and checks.
Merge branch 'robert' into Zeke