Merge branch 'patch/JAL-4260_fix_up_select_via_ruler_in_wrapped' into develop