Revert "Revert "Core Common""

This reverts commit b73036d8d4629e46cc7c1b5d0e4b3608436ec8c1.