am 4cc6e2e3: Merge "init: expand_props on trigger"

* commit '4cc6e2e33f9fae58e0d125adcc51171cdc6da435':
  init: expand_props on trigger