Merge "Build with core_current"