Revert "merge master 3.0 and c_august"