(cherry picked from commit 8552838bdae29b6b6001b5efd958dd00fcdf7443) # Conflicts: # .github/renovate.json