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

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