EPD-190: Updated IntendedRouteHandlerCommon to use new settings class.
EPD-190: Small updates