Improved merging changes stream. Issue: #370