Chiba 2.4
Merge branch 'chiba.2' into rel_d