Merge branch 'as/diff-options-grammofix'