Merge change 2903

* changes:
  completed implementation of "trigger" for init