fast-forwarding master to auto = 111a196e