Refs #18155; archived or just created versions no longer mess the order of versions
Merge remote-tracking branch 'collective/master'