Merge pull request #13349 from olek2/coremark