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

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