Merge "Add more assertions to testStackedLinkProperties." into rvc-dev