[PATCH 6.6 0/2] Backport 2 commits to 6.12.y to fix bond issue