Backport user cancel

Closes #3620912

Merge request reports

Loading