Merge "Fix RS bug with message ID 0."