Merge pull request #1560 from vwadekar/denver-fixes-918

Recent Denver CPU fixes from downstream