merge revision (cherry pick) with angular resolutions

bef462aaa0b842587ada6d45befcc2dfca72b755