Merge branch 'feature/precise-sat'