Merge branch 'PAGE_CACHE_SIZE-removal'