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

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