Apply #1 from #2386247