Merge "init: expand_props on trigger"