Combined my-core-firmware into core-firmware