Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev