Merge branch 'maint' * maint: Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"