Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev