Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev