Merge "Check for nearby component in config" into tm-qpr-dev