Upgrade and Fix Core Common Dependency