fix #4166: inconsistent labels for non-event cache
Merge branch 'release' into upstream