More sanity checking on input format options
Merge branch 'dev' into ms