Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev