MP1-4155: finished splitting demuxers