Merge pull request #2143 from get10101/chore/convenient-confirm