Merge: rev821 (devices and email flow fixes, and cancel links now ctas)