fast-forwarding master to auto = f41324c2