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 '7ecf636997b812ff5ae87ea9e146707d37d1b78a':
  Make IEffect command more robust (second try)