am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev

* commit '5e193041ab8a541b478dd1b61c8c8cd24bca2ab5':
  Make IEffect command more robust (second try)