fast-forwarding master to auto = a61417e2