Merge "Added RoutingContext annotation, updated InstanceIdentifier"