Merge pull request #1862 from anandpdoshi/anand-wip-4.1

Fixes in Website Route system and other misc fixes