Issue #24421:reimplement old logic when metric EnableGaplessNumbering is false
Merge pull request #1786 from garyhgohoos/24421

Issue #24421:reimplement old logic when metric EnableGaplessNumbering is...