Merge "Fallback on propertyKey if no stableId is provided"