Merge 3.5 (fix internal_select)