Merge branch 'master' into magma_refinement