Merge branch 'jk/pretty-G-format-fixes'