Merge branch 'features/range_select'