Merge branch 'cleanup_refinements' into sprint56