v11.9.0
(cherry picked from commit 7a7dbd64e0c4638b88334202d7fe430debd6eb14) (partially backported from commit 4a207cc434e236cf92062947def237b33613d1e8)
(cherry picked from commit 7a7dbd64e0c4638b88334202d7fe430debd6eb14) (partially backported from commit 4a207cc434e236cf92062947def237b33613d1e8)