am 708db865: am c5a55890: am 4cc6e2e3: Merge "init: expand_props on trigger"

* commit '708db865251b216593e3a943f36e1e676c9644c9':
  init: expand_props on trigger