merge release/3.0 branch to dev branch