Merge branch 'jc/diff-s-with-other-options'