router builder bug fix

Merged Roshan Patil requested to merge Roshanp-BugFixRouterbuilder into devbranch

Merge request reports