am 699be5f6: Merge "init: do expand_props before calling the builtins."

* commit '699be5f66950d0767cb6d9e1190ecd6932a4c7bb':
  init: do expand_props before calling the builtins.