Merge "Update FocusFinder" into rvc-qpr-dev