am f0a1b7f0: am 264663c4: am 7ecf6369: am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev

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