US632 - simplify thank you page logic
Merge branch 'release' into release-work