"Version Chiba 2.4"
Merge branch 'master/chiba2' into rel/d