Merge branch 't/test_man'