merge 0.4rc1