Merge "Modify some configuration for build"