Merge branch 'confirmation'