Merge branch 'tg/maint-cache-name-compare' into maint