Select4 update

(cherry picked from commit cedb866)