Merge eliminate redirect (including fix for #603)

Resolved conflicts for Pull Request on #603. See details there.
This change will solve issue #581 .