@Jackie @Xiang Fu can someone help take a look at these two prs?

thanks @Jackie for approval for github.com/apache/pinot/pull/18813. I have replied on github.com/apache/pinot/pull/18733, let me know your thoughts. We can close it if that's a scenario we want to handle.