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