Backport #31966, #31973 Cherry-pick 30da734f37, 74b1c589c6 Replace #31972 --------- Co-authored-by: techknowlogick <techknowlogick@noreply.gitea.com>
30da734f37
74b1c589c6