Merge branch 'daniel_2213' into v1.12.x
Replace cache_size with cache-size -- #2205
Merge branch 'v1.12.x' into next