FS-5095 --resolve all boils down to uninitialized vars grrr
FS-5105 --resolve