Merge branch 'rs/maint-estimate-cache-size' into maint