merged from 0.4