fast-forwarding master to auto = 685dec1a