Refs #10194 attempting to fix build
Merge branch 'feature/10194_save_nxtomo' into develop