Merge "Speed up lookups" into rvc-qpr-dev