XD-824 updated StreamPlugin