[cherry-pick] #22837 and #22810 to earlgrey_es_sival
branch
#22968
Azure Pipelines / CI (CW340's Earl Grey Bitstream)
succeeded
May 3, 2024 in 1h 34m 43s
CW340's Earl Grey Bitstream succeeded
Loading