Merge branch 'jk/merge-quiet'