Merge "Minor upstream selection refactoring"