Merge "Use findSelectedItems instead of getSelectedItems"