Merge branch 'sobol_use_cache_hotfix' into develop