[Don't merge]Rebase Shuang's draft HDR patches to latest code base #700

Closed yuanzhel closed 4 years ago