Merge master -> new_disc_cache_api