Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field