Merge branch 't/id3_conf'