[Feature Request] Give priority to Optimized versions when streaming

Early 2021 clean-up: duplicate