Core sha update and cmake tidy up [skip ci]