Merge branch 'gerrit/cheshire-cat'