Backport additional Selection fixes from 2.1