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

Change-Id: I6da7365177ca8f0880a3ae54295164ae8672a157