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

* commit 'c5a558907a49dae3db6c40c2032a92841c93b2d6':
  init: expand_props on trigger