Implemented #29503 --------- Co-authored-by: Ben Chang <[email protected]> Co-authored-by: wxiaoguang <[email protected]>