Merge branch 'correctness'