I see some CI test errors in this PR, could you please help take a look?

Thanks in advance.

Originally posted by @Nic-Ma in #3508 (comment)