Merge branch 'es/rebase-i-respect-core-commentchar'