Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev