XD-1889 Code review - add statuses for streams