Merge branch 'sobol-templates-hotfix' into release