Merge "Evaluate property-configuration mechanisms"