Merge "Add support for single-select mode."