Merge "Tweaks requested for multi select"