Merge "Do not include selected output in secondary output list." into main