v6.5.5-20231128-af9cb77
af9cb77f · cdc: cherry picks #9982 and #10054 (#10165) ·