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

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