Added instant retry without pushing a button.
Merge branch 'master' into api-1.1