Polish redirect flows #4040

Job	Run time
Test Against Snapshots / Test	3m 0s
Build (windows-latest, 17) / Build	7m 46s
Build (ubuntu-latest, 17) / Build	3m 37s
Deploy Artifacts / Deploy Artifacts	2m 37s
Perform Release / Perform Release	0s
	17m 0s

Provide feedback