Merge "Improvements to multi select"