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

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