Merge branch 't/patch58'