Merge "Use the full component name to construct route ids." into klp-dev