merge-sync'd with test-rundat2 in prep for merging rundat changes.