v7.1.1-20230825-81ceb31
81ceb312 · planner: cherry-pick #45824, #45831 and #46312 (#46391) ·