Merge remote-tracking branch 'nickva/fix-int-range-shrink'