Merge pull request #1859 from sergey-vb/sergey-vb-fix-redirection_number