fix various code pro issues
merge more-code-pro into dev-gradle
merge more-code-pro into dev-gradle