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

... false