Merge "Track changes to add core-simple to the boot cp"