Merge branch 'hv/bitshift-constants-in-blame'