Merge branch 't/manual_improvements'