* sync more files from 3.0