Merge branch 'ht/range-fix'