merge with 3.0/master and fix conflict