Merge "Improve property-based configuration"