Merge "Ensure that we check the multi-instance property flag before querying properties" into main