Update caches - Fresh merge for master-integration and 3.01a-integration