Merge "Fix: Wrong ps/rev in change-merged stream-event"