Merge branch 't/m4_deps'