Core Merge

Core Merge