Update router logic#779

abhijitb wants to merge 5 commits intotrunknewfold-labs/wp-module-onboarding:trunkfrom

update/router-logicnewfold-labs/wp-module-onboarding:update/router-logicCopy head branch name to clipboard