Merge "Clear effect buffer before sending to chain" into lmp-dev