Quote #16590

Updates for program selection.