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