Revert "Revert "Merge pull request #2591 from redconfetti/CLC-3588-confirmation-page""

This reverts commit 0346c47b6b8a14d0c30af74fc90f05dee8b6a902.