Make sure we don't press on before anything has happened.
Merge bug26368
stable to default