More Mako 4.2.2

Change-Id: I42b43b5467edffdf7999ad4aa6c3cb4017957d8f