Merge "Fix original sync id bug in event exceptions"