corrected redirect flows
Merge branch 'release_0.3.4'