Merge "init: make CheckPropertyTriggers() more efficient"