LPS-44833 Force redirect on error
Merge branch 'surface' into master-deprecated-surface