Merge branch 't/dia'