Merge 2.x version to 3.0 version