[13508] Update to support lib r11