router builder bug fix

Merged Roshan Patil requested to merge Roshanp-BugFixRouterbuilder into devbranch
  1. Sep 06, 2018