Merge "Adding default handler to (re)Routing callbacks where no handler is provided." into mnc-dev