Merge branch 'mad-hatter' into 'cheshire-cat'

Change-Id: If5c860789f437411b35b96b09b89bde294aa91f4