fast-forwarding master to auto = 7d4f4876