BUG-5626: Move leaderId/leaderPayloadVersion fields