Merge "Remove conversion warnings from hbd shifts"