Merge branch 'sb/plug-leak-in-make-cache-entry' into maint