Merge branch 'cheshire-cat' into master

Change-Id: I20a3072071f8e1364d13333c67773981c12060b5