Hi Mingkai, thanks a lot for the analysis and the diff, it helps a lot.
I pushed this change: https://code.orgmode.org/bzg/org-mode/commit/dfdd5cd0 Keeping the headline numbering consistent with the TOC numbering seems the right thing to do here. Thanks! -- Bastien
