Merge branch 'ng/mergetool-lose-final-prompt'