Add user confirm back in to normal run.
Merge branch 'develop' into feature/repl