redirectTo optional parameter
reformat
reformat again
Merge branch 'issue312' into v4.3