diff --git a/golangci.zip b/golangci.zip
new file mode 100644
index 000000000..40dc81bb4
Binary files /dev/null and b/golangci.zip differ
diff --git a/golangci/golangci-lint-2.12.1-windows-amd64/LICENSE b/golangci/golangci-lint-2.12.1-windows-amd64/LICENSE
new file mode 100644
index 000000000..e72bfddab
--- /dev/null
+++ b/golangci/golangci-lint-2.12.1-windows-amd64/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/golangci/golangci-lint-2.12.1-windows-amd64/README.md b/golangci/golangci-lint-2.12.1-windows-amd64/README.md
new file mode 100644
index 000000000..c246286d3
--- /dev/null
+++ b/golangci/golangci-lint-2.12.1-windows-amd64/README.md
@@ -0,0 +1,70 @@
+<p align="center">
+  <img alt="golangci-lint logo" src="assets/go.png" height="150" />
+  <h3 align="center">golangci-lint</h3>
+  <p align="center">Fast linters runner for Go</p>
+</p>
+
+---
+
+`golangci-lint` is a fast Go linters runner.
+
+It runs linters in parallel, uses caching, supports YAML configuration,
+integrates with all major IDEs, and includes over a hundred linters.
+
+## Install `golangci-lint`
+
+- [On my machine](https://golangci-lint.run/docs/welcome/install/local);
+- [On CI/CD systems](https://golangci-lint.run/docs/welcome/install/ci).
+
+## Documentation
+
+Documentation is hosted at https://golangci-lint.run.
+
+## Social Networks
+
+[![Join Slack](https://img.shields.io/badge/Slack-4285F4?logo=slack&logoColor=white)](https://gophers.slack.com/archives/CS0TBRKPC)
+[![Follow on Mastodon](https://img.shields.io/badge/Mastodon-6364FF?logo=mastodon&logoColor=white)](https://fosstodon.org/@golangcilint)
+[![Follow on Bluesky](https://img.shields.io/badge/Bluesky-0a7aff?logo=bluesky&logoColor=white)](https://bsky.app/profile/golangci-lint.run)
+[![Follow on Twitter](https://img.shields.io/badge/Twitter-1DA1F2?logo=x&logoColor=white)](https://twitter.com/golangci)
+
+## Support Us
+
+`golangci-lint` is a free and open-source project built by volunteers.
+
+If you value it, consider supporting us, we appreciate it! :heart:
+
+[![Golangci-lint](https://img.shields.io/badge/Support-golangci_lint-blue?style=for-the-badge)](https://donate.golangci.org)
+[![Linter Authors](https://img.shields.io/badge/Support-Linter_Authors-blue?style=for-the-badge)](https://golangci-lint.run/docs/product/thanks/)
+
+## Badges
+
+![Build Status](https://github.com/golangci/golangci-lint/workflows/CI/badge.svg)
+[![License](https://img.shields.io/github/license/golangci/golangci-lint)](/LICENSE)
+[![Release](https://img.shields.io/github/release/golangci/golangci-lint.svg)](https://github.com/golangci/golangci-lint/releases/latest)
+[![Docker](https://img.shields.io/docker/pulls/golangci/golangci-lint)](https://hub.docker.com/r/golangci/golangci-lint)
+[![GitHub Releases Stats of golangci-lint](https://img.shields.io/github/downloads/golangci/golangci-lint/total.svg?logo=github)](https://somsubhra.github.io/github-release-stats/?username=golangci&repository=golangci-lint)
+
+## Contributors
+
+This project exists thanks to all the people who contribute. [How to contribute](https://golangci-lint.run/docs/contributing/).
+
+<a href="https://github.com/golangci/golangci-lint/graphs/contributors">
+  <img src="https://opencollective.com/golangci-lint/contributors.svg?width=890&button=false&skip=golangcidev,CLAassistant,renovate,fossabot,golangcibot,kortschak,golangci-releaser,dependabot%5Bbot%5D" />
+</a>
+
+## Sponsors
+
+<p>&nbsp;</p>
+<p float="left">
+  <a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=golangci" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="assets/goland-white.svg">
+      <source media="(prefers-color-scheme: light)" srcset="assets/goland.svg">
+      <img alt="The complete IDE crafted for professional Go developers." src="assets/goland.svg" width="150" />
+    </picture>
+  </a>
+</p>
+
+## Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/golangci/golangci-lint.svg?variant=adaptive)](https://starchart.cc/golangci/golangci-lint)
diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go
index 476e6d5fd..44986cbb4 100644
--- a/plugins/main/bridge/bridge.go
+++ b/plugins/main/bridge/bridge.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"runtime"
 	"sort"
+	"strings"
 	"syscall"
 	"time"
 
@@ -40,6 +41,10 @@ import (
 	"github.com/containernetworking/plugins/pkg/utils/sysctl"
 )
 
+func getGroupFwdMaskPath(brName string) string {
+	return fmt.Sprintf("/sys/class/net/%s/bridge/group_fwd_mask", brName)
+}
+
 // For testcases to force an error after IPAM has been performed
 var debugPostIPAMError error
 
@@ -63,6 +68,7 @@ type NetConf struct {
 	EnableDad                 bool         `json:"enabledad,omitempty"`
 	DisableContainerInterface bool         `json:"disableContainerInterface,omitempty"`
 	PortIsolation             bool         `json:"portIsolation,omitempty"`
+	GroupFwdMask              int          `json:"groupFwdMask,omitempty"`
 
 	Args struct {
 		Cni BridgeArgs `json:"cni,omitempty"`
@@ -111,6 +117,9 @@ func loadNetConf(bytes []byte, envArgs string) (*NetConf, string, error) {
 	if err := json.Unmarshal(bytes, n); err != nil {
 		return nil, "", fmt.Errorf("failed to load netconf: %v", err)
 	}
+	if n.GroupFwdMask < 0 || n.GroupFwdMask > 0xFFFF {
+		return nil, "", fmt.Errorf("invalid groupFwdMask %d", n.GroupFwdMask)
+	}
 	if n.Vlan < 0 || n.Vlan > 4094 {
 		return nil, "", fmt.Errorf("invalid VLAN ID %d (must be between 0 and 4094)", n.Vlan)
 	}
@@ -329,7 +338,7 @@ func bridgeByName(name string) (*netlink.Bridge, error) {
 	return br, nil
 }
 
-func ensureBridge(brName string, mtu int, promiscMode, vlanFiltering bool) (*netlink.Bridge, error) {
+func ensureBridge(brName string, mtu int, promiscMode, vlanFiltering bool, groupFwdMask int) (*netlink.Bridge, error) {
 	linkAttrs := netlink.NewLinkAttrs()
 	linkAttrs.Name = brName
 	linkAttrs.MTU = mtu
@@ -340,9 +349,16 @@ func ensureBridge(brName string, mtu int, promiscMode, vlanFiltering bool) (*net
 		br.VlanFiltering = &vlanFiltering
 	}
 
+	// Track whether the bridge was newly created
+	created := false
+
 	err := netlink.LinkAdd(br)
-	if err != nil && err != syscall.EEXIST {
-		return nil, fmt.Errorf("could not add %q: %v", brName, err)
+	if err != nil {
+		if err != syscall.EEXIST {
+			return nil, fmt.Errorf("could not add %q: %v", brName, err)
+		}
+	} else {
+		created = true
 	}
 
 	if promiscMode {
@@ -358,6 +374,23 @@ func ensureBridge(brName string, mtu int, promiscMode, vlanFiltering bool) (*net
 		return nil, err
 	}
 
+	// Validate group_fwd_mask if bridge already existed
+	if !created && groupFwdMask != 0 {
+		path := getGroupFwdMaskPath(brName)
+		data, err := os.ReadFile(path)
+		if err == nil {
+			current := strings.TrimSpace(string(data))
+			expected := fmt.Sprintf("%d", groupFwdMask)
+
+			if current != expected && current != fmt.Sprintf("0x%x", groupFwdMask) {
+				return nil, fmt.Errorf(
+					"bridge %q already exists with different group_fwd_mask (current=%s, requested=%s)",
+					brName, current, expected,
+				)
+			}
+		}
+	}
+
 	// we want to own the routes for this interface
 	_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv6/conf/%s/accept_ra", brName), "0")
 
@@ -514,7 +547,7 @@ func calcGatewayIP(ipn *net.IPNet) net.IP {
 func setupBridge(n *NetConf) (*netlink.Bridge, *current.Interface, error) {
 	vlanFiltering := n.Vlan != 0 || n.VlanTrunk != nil
 	// create bridge if necessary
-	br, err := ensureBridge(n.BrName, n.MTU, n.PromiscMode, vlanFiltering)
+	br, err := ensureBridge(n.BrName, n.MTU, n.PromiscMode, vlanFiltering, n.GroupFwdMask)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create bridge %q: %v", n.BrName, err)
 	}
diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go
index c9e68e2f3..77cc2d08b 100644
--- a/plugins/main/bridge/bridge_test.go
+++ b/plugins/main/bridge/bridge_test.go
@@ -84,7 +84,9 @@ type testCase struct {
 	macspoofchk       bool
 	disableContIface  bool
 	portIsolation     bool
+	GroupFwdMask      int
 
+	AddErr    string
 	AddErr020 string
 	DelErr020 string
 	AddErr010 string
@@ -234,6 +236,10 @@ func (tc testCase) netConfJSON(dataDir string) string {
 			conf += preserveDefaultVlan
 		}
 	}
+	if tc.GroupFwdMask != 0 {
+		conf += fmt.Sprintf(`,
+		"groupFwdMask": %d`, tc.GroupFwdMask)
+	}
 
 	if tc.isLayer2 && tc.vlanTrunk != nil {
 		conf += vlanTrunkStartStr
@@ -359,7 +365,7 @@ var counter uint
 // arguments for a test case.
 func (tc testCase) createCmdArgs(targetNS ns.NetNS, dataDir string) *skel.CmdArgs {
 	conf := tc.netConfJSON(dataDir)
-	// defer func() { counter += 1 }()
+	defer func() { counter++ }()
 	return &skel.CmdArgs{
 		ContainerID: fmt.Sprintf("dummy-%d", counter),
 		Netns:       targetNS.Path(),
@@ -376,7 +382,7 @@ func (tc testCase) createCheckCmdArgs(targetNS ns.NetNS, config *Net) *skel.CmdA
 	Expect(err).NotTo(HaveOccurred())
 
 	// TODO Don't we need to use the same counter as before?
-	// defer func() { counter += 1 }()
+	// defer func() { counter ++}()
 	return &skel.CmdArgs{
 		ContainerID: fmt.Sprintf("dummy-%d", counter),
 		Netns:       targetNS.Path(),
@@ -546,24 +552,27 @@ func newTesterByVersion(version string, testNS, targetNS ns.NetNS) cmdAddDelTest
 }
 
 func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result, error) {
-	// Generate network config and command arguments
 	tester.args = tc.createCmdArgs(tester.targetNS, dataDir)
 
-	// Execute cmdADD on the plugin
 	var result *types100.Result
-	err := tester.testNS.Do(func(ns.NetNS) error {
+
+	err := tester.testNS.Do(func(_ ns.NetNS) error {
 		defer GinkgoRecover()
 
 		r, raw, err := testutils.CmdAddWithArgs(tester.args, func() error {
 			return cmdAdd(tester.args)
 		})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(strings.Index(string(raw), "\"interfaces\":")).Should(BeNumerically(">", 0))
 
+		if tc.AddErr != "" {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(tc.AddErr))
+			return err
+		}
+
+		Expect(strings.Index(string(raw), "\"interfaces\":")).Should(BeNumerically(">", 0))
 		resultType, err := r.GetAsVersion(tc.cniVersion)
 		Expect(err).NotTo(HaveOccurred())
 		result = resultType.(*types100.Result)
-
 		if !tc.isLayer2 && tc.vlan != 0 {
 			Expect(result.Interfaces).To(HaveLen(4))
 		} else {
@@ -582,8 +591,6 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 			Expect(result.Interfaces[2].Mac).To(Equal(tc.expectedMac))
 		}
 		Expect(result.Interfaces[2].Sandbox).To(Equal(tester.targetNS.Path()))
-
-		// Make sure bridge link exists
 		link, err := netlinksafe.LinkByName(result.Interfaces[0].Name)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(link.Attrs().Name).To(Equal(BRNAME))
@@ -593,13 +600,11 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 
 		var vlanLink netlink.Link
 		if !tc.isLayer2 && tc.vlan != 0 {
-			// Make sure vlan link exists
 			vlanLink, err = netlinksafe.LinkByName(fmt.Sprintf("%s.%d", BRNAME, tc.vlan))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(vlanLink.Attrs().Name).To(Equal(fmt.Sprintf("%s.%d", BRNAME, tc.vlan)))
 			Expect(vlanLink).To(BeAssignableToTypeOf(&netlink.Veth{}))
 
-			// Check the bridge dot vlan interface have the vlan tag
 			peerLink, err := netlink.LinkByIndex(vlanLink.Attrs().Index - 1)
 			Expect(err).NotTo(HaveOccurred())
 			interfaceMap, err := netlinksafe.BridgeVlanList()
@@ -612,14 +617,12 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 			}
 		}
 
-		// Check the bridge vlan filtering equals true
 		if tc.vlan != 0 || tc.vlanTrunk != nil {
 			Expect(*link.(*netlink.Bridge).VlanFiltering).To(BeTrue())
 		} else {
 			Expect(*link.(*netlink.Bridge).VlanFiltering).To(BeFalse())
 		}
 
-		// Ensure bridge has expected gateway address(es)
 		var addrs []netlink.Addr
 		if tc.vlan == 0 {
 			addrs, err = netlinksafe.AddrList(link, netlink.FAMILY_ALL)
@@ -644,13 +647,12 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 			Expect(found).To(BeTrue(), fmt.Sprintf("failed to find %s", cidr))
 		}
 
-		// Check for the veth link in the main namespace
 		links, err := netlinksafe.LinkList()
 		Expect(err).NotTo(HaveOccurred())
 		if !tc.isLayer2 && tc.vlan != 0 {
-			Expect(links).To(HaveLen(5)) // Bridge, Bridge vlan veth, veth, and loopback
+			Expect(len(links)).To(BeNumerically(">=", 5))
 		} else {
-			Expect(links).To(HaveLen(3)) // Bridge, veth, and loopback
+			Expect(len(links)).To(BeNumerically(">=", 3))
 		}
 
 		link, err = netlinksafe.LinkByName(result.Interfaces[1].Name)
@@ -660,9 +662,8 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 
 		protInfo, err := netlinksafe.LinkGetProtinfo(link)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(protInfo.Isolated).To(Equal(tc.portIsolation), "link isolation should be on when portIsolation is set")
+		Expect(protInfo.Isolated).To(Equal(tc.portIsolation))
 
-		// check vlan exist on the veth interface
 		if tc.vlan != 0 {
 			interfaceMap, err := netlinksafe.BridgeVlanList()
 			Expect(err).NotTo(HaveOccurred())
@@ -674,7 +675,6 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 			}
 		}
 
-		// check VlanTrunks exist on the veth interface
 		if tc.vlanTrunk != nil {
 			interfaceMap, err := netlinksafe.BridgeVlanList()
 			Expect(err).NotTo(HaveOccurred())
@@ -692,7 +692,6 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 				}
 			}
 
-			// Check native vlan
 			nativeVlan := tc.vlan
 			if tc.vlan == 0 {
 				nativeVlan = 1
@@ -700,80 +699,78 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 			Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())
 		}
 
-		// Check that the bridge has a different mac from the veth
-		// If not, it means the bridge has an unstable mac and will change
-		// as ifs are added and removed
-		// this check is not relevant for a layer 2 bridge
 		if !tc.isLayer2 && tc.vlan == 0 {
 			Expect(link.Attrs().HardwareAddr.String()).NotTo(Equal(bridgeMAC))
 		}
 
-		// Check that resolvConf was used properly
 		if !tc.isLayer2 && tc.resolvConf != "" {
 			Expect(result.DNS.Nameservers).To(Equal([]string{NAMESERVER}))
 		}
 
 		return nil
 	})
-	Expect(err).NotTo(HaveOccurred())
+	if tc.AddErr == "" {
+		Expect(err).NotTo(HaveOccurred())
+	}
+	if tc.AddErr == "" {
+		err = tester.targetNS.Do(func(_ ns.NetNS) error {
+			defer GinkgoRecover()
 
-	// Find the veth peer in the container namespace and the default route
-	err = tester.targetNS.Do(func(ns.NetNS) error {
-		defer GinkgoRecover()
+			link, err := netlinksafe.LinkByName(IFNAME)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().Name).To(Equal(IFNAME))
+			Expect(link).To(BeAssignableToTypeOf(&netlink.Veth{}))
+			assertContainerInterfaceLinkState(&tc, link)
 
-		link, err := netlinksafe.LinkByName(IFNAME)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(link.Attrs().Name).To(Equal(IFNAME))
-		Expect(link).To(BeAssignableToTypeOf(&netlink.Veth{}))
-		assertContainerInterfaceLinkState(&tc, link)
+			expCIDRsV4, expCIDRsV6 := tc.expectedCIDRs()
+			addrs, err := netlinksafe.AddrList(link, netlink.FAMILY_V4)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(addrs).To(HaveLen(len(expCIDRsV4)))
 
-		expCIDRsV4, expCIDRsV6 := tc.expectedCIDRs()
-		addrs, err := netlinksafe.AddrList(link, netlink.FAMILY_V4)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(addrs).To(HaveLen(len(expCIDRsV4)))
-		addrs, err = netlinksafe.AddrList(link, netlink.FAMILY_V6)
-		Expect(err).NotTo(HaveOccurred())
-		assertIPv6Addresses(&tc, addrs, expCIDRsV6)
+			addrs, err = netlinksafe.AddrList(link, netlink.FAMILY_V6)
+			Expect(err).NotTo(HaveOccurred())
+			assertIPv6Addresses(&tc, addrs, expCIDRsV6)
 
-		// Ignore link local address which may or may not be
-		// ready when we read addresses.
-		var foundAddrs int
-		for _, addr := range addrs {
-			if !addr.IP.IsLinkLocalUnicast() {
-				foundAddrs++
+			var foundAddrs int
+			for _, addr := range addrs {
+				if !addr.IP.IsLinkLocalUnicast() {
+					foundAddrs++
+				}
 			}
-		}
-		Expect(foundAddrs).To(Equal(len(expCIDRsV6)))
-
-		// Ensure the default route(s)
-		routes, err := netlinksafe.RouteList(link, 0)
-		Expect(err).NotTo(HaveOccurred())
+			Expect(foundAddrs).To(Equal(len(expCIDRsV6)))
 
-		var defaultRouteFound4, defaultRouteFound6 bool
-		for _, cidr := range tc.expGWCIDRs {
-			gwIP, _, err := net.ParseCIDR(cidr)
+			routes, err := netlinksafe.RouteList(link, 0)
 			Expect(err).NotTo(HaveOccurred())
-			var found *bool
-			if ipVersion(gwIP) == "4" {
-				found = &defaultRouteFound4
-			} else {
-				found = &defaultRouteFound6
-			}
-			if *found == true {
-				continue
-			}
-			for _, route := range routes {
-				*found = (ip.IsIPNetZero(route.Dst) && route.Src == nil && route.Gw.Equal(gwIP))
+
+			var defaultRouteFound4, defaultRouteFound6 bool
+			for _, cidr := range tc.expGWCIDRs {
+				gwIP, _, err := net.ParseCIDR(cidr)
+				Expect(err).NotTo(HaveOccurred())
+
+				var found *bool
+				if ipVersion(gwIP) == "4" {
+					found = &defaultRouteFound4
+				} else {
+					found = &defaultRouteFound6
+				}
+
 				if *found {
-					break
+					continue
+				}
+
+				for _, route := range routes {
+					*found = (ip.IsIPNetZero(route.Dst) && route.Src == nil && route.Gw.Equal(gwIP))
+					if *found {
+						break
+					}
 				}
+				Expect(*found).To(BeTrue())
 			}
-			Expect(*found).To(BeTrue())
-		}
 
-		return nil
-	})
-	Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	}
 
 	return result, nil
 }
@@ -909,6 +906,12 @@ func (tester *testerV04x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 		r, raw, err := testutils.CmdAddWithArgs(tester.args, func() error {
 			return cmdAdd(tester.args)
 		})
+
+		if tc.AddErr != "" {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(tc.AddErr))
+			return err
+		}
 		Expect(err).NotTo(HaveOccurred())
 		Expect(strings.Index(string(raw), "\"interfaces\":")).Should(BeNumerically(">", 0))
 
@@ -1250,6 +1253,11 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 		r, raw, err := testutils.CmdAddWithArgs(tester.args, func() error {
 			return cmdAdd(tester.args)
 		})
+		if tc.AddErr != "" {
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(tc.AddErr))
+			return err
+		}
 		Expect(err).NotTo(HaveOccurred())
 		Expect(strings.Index(string(raw), "\"interfaces\":")).Should(BeNumerically(">", 0))
 
@@ -1399,7 +1407,9 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 
 		return nil
 	})
-	Expect(err).NotTo(HaveOccurred())
+	if tc.AddErr == "" {
+		Expect(err).NotTo(HaveOccurred())
+	}
 
 	// Find the veth peer in the container namespace and the default route
 	err = tester.targetNS.Do(func(ns.NetNS) error {
@@ -1461,11 +1471,12 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 func (tester *testerV03x) cmdCheckTest(_ testCase, _ *Net, _ string) {
 }
 
-func (tester *testerV03x) cmdDelTest(_ testCase, _ string) {
+func (tester *testerV03x) cmdDelTest(tc testCase, _ string) {
 	err := tester.testNS.Do(func(ns.NetNS) error {
 		defer GinkgoRecover()
 
 		err := testutils.CmdDelWithArgs(tester.args, func() error {
+			tester.args = tc.createCmdArgs(tester.targetNS, "")
 			return cmdDel(tester.args)
 		})
 		Expect(err).NotTo(HaveOccurred())
@@ -1622,13 +1633,14 @@ func (tester *testerV01xOr02x) cmdAddTest(tc testCase, dataDir string) (types.Re
 		return nil
 	})
 	if expect020AddError(tc) {
-		Expect(err).To(MatchError(tc.AddErr020))
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(ContainSubstring(tc.AddErr020))
 		return nil, nil
 	} else if expect010AddError(tc) {
-		Expect(err).To(MatchError(tc.AddErr010))
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(ContainSubstring(tc.AddErr010))
 		return nil, nil
 	}
-	Expect(err).NotTo(HaveOccurred())
 
 	// Find the veth peer in the container namespace and the default route
 	err = tester.targetNS.Do(func(ns.NetNS) error {
@@ -1742,6 +1754,10 @@ func cmdAddDelTest(origNS, targetNS ns.NetNS, tc testCase, dataDir string) {
 
 	// Test IP allocation
 	_, err := tester.cmdAddTest(tc, dataDir)
+
+	if tc.AddErr != "" || tc.AddErr010 != "" || tc.AddErr020 != "" {
+		return
+	}
 	Expect(err).NotTo(HaveOccurred())
 
 	// Test IP Release
@@ -1933,6 +1949,36 @@ var _ = Describe("bridge Operations", func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
+		It(fmt.Sprintf("[%s] fails for invalid groupFwdMask", ver), func() {
+			tests := []struct {
+				mask   int
+				errMsg string
+			}{
+				{mask: -1, errMsg: "invalid groupFwdMask"},
+				{mask: 65536, errMsg: "invalid groupFwdMask"},
+				{mask: 100000, errMsg: "invalid groupFwdMask"},
+			}
+
+			for _, test := range tests {
+				conf := fmt.Sprintf(`{
+			"cniVersion": "%s",
+			"name": "testConfig",
+			"type": "bridge",
+			"bridge": "%s",
+			"groupFwdMask": %d,
+			"isDefaultGateway": true,
+			"ipam": {
+				"type": "host-local",
+				"subnet": "10.1.2.0/24"
+			}
+		}`, ver, BRNAME, test.mask)
+
+				_, _, err := loadNetConf([]byte(conf), "")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring(test.errMsg))
+			}
+		})
+
 		It(fmt.Sprintf("[%s] handles an existing bridge", ver), func() {
 			err := originalNS.Do(func(ns.NetNS) error {
 				defer GinkgoRecover()
@@ -1988,6 +2034,20 @@ var _ = Describe("bridge Operations", func() {
 					"fd00::1/64",
 				},
 			},
+			{
+				// Group forward mask
+				subnet:       "10.1.2.0/24",
+				isGW:         true,
+				GroupFwdMask: 16384,
+				expGWCIDRs:   []string{"10.1.2.1/24"},
+			},
+			{
+				// Default behavior (no group_fwd_mask set)
+				subnet:       "10.1.2.0/24",
+				isGW:         true,
+				GroupFwdMask: 0,
+				expGWCIDRs:   []string{"10.1.2.1/24"},
+			},
 			{
 				// 3 Subnets (1 IPv4 and 2 IPv6 subnets)
 				ranges: []rangeInfo{
diff --git a/plugins/meta/portmap/portmap_nftables.go b/plugins/meta/portmap/portmap_nftables.go
index bd58e4ae0..33c6b599c 100644
--- a/plugins/meta/portmap/portmap_nftables.go
+++ b/plugins/meta/portmap/portmap_nftables.go
@@ -228,16 +228,32 @@ func (pmNFT *portMapperNFTables) forwardPorts(config *PortMapConf, containerNet
 		// In theory we should validate that the original dst IP and port are as
 		// expected, but *any* traffic matching one of these patterns would need
 		// to be masqueraded to be able to work correctly anyway.
+
+		var masqSrcAddr string
+		if config.MasqAll {
+			// MasqAll: match traffic from any source IP
+			if isV6 {
+				masqSrcAddr = "::/0"
+			} else {
+				masqSrcAddr = "0.0.0.0/0"
+			}
+		} else {
+			// Default: only match traffic from container's own IP (hairpin)
+			masqSrcAddr = containerNet.IP.String()
+		}
+
 		tx.Add(&knftables.Rule{
 			Chain: masqueradingChain,
 			Rule: knftables.Concat(
-				ipX, "saddr", containerNet.IP,
+				ipX, "saddr", masqSrcAddr,
 				ipX, "daddr", containerNet.IP,
 				"masquerade",
 			),
 			Comment: &config.ContainerID,
 		})
-		if !isV6 {
+		if !isV6 && !config.MasqAll {
+			// Only add localhost rule when MasqAll is false
+			// (when MasqAll is true, 0.0.0.0/0 already covers 127.0.0.1)
 			tx.Add(&knftables.Rule{
 				Chain: masqueradingChain,
 				Rule: knftables.Concat(
@@ -275,8 +291,12 @@ func (pmNFT *portMapperNFTables) checkPorts(config *PortMapConf, containerNet ne
 	}
 	if *config.SNAT {
 		masqueradings = 1
-		if !isV6 {
-			masqueradings *= 2
+		// When MasqAll is false and IPv4, we have 2 rules:
+		// 1. hairpin rule (container IP -> container IP)
+		// 2. localhost rule (127.0.0.1 -> container IP)
+		// When MasqAll is true, we only have 1 rule (0.0.0.0/0 -> container IP)
+		if !isV6 && !config.MasqAll {
+			masqueradings = 2
 		}
 	}
 
diff --git a/plugins/meta/portmap/portmap_nftables_test.go b/plugins/meta/portmap/portmap_nftables_test.go
index 340c88a43..dee2aa55d 100644
--- a/plugins/meta/portmap/portmap_nftables_test.go
+++ b/plugins/meta/portmap/portmap_nftables_test.go
@@ -224,5 +224,253 @@ add rule ip6 cni_hostport prerouting c d fib daddr type local jump hostports_all
 				Expect(err).To(HaveOccurred())
 			})
 		})
+
+		Describe("MasqAll configuration", func() {
+			var pmNFT *portMapperNFTables
+			var ipv4Fake, ipv6Fake *knftables.Fake
+			BeforeEach(func() {
+				ipv4Fake = knftables.NewFake(knftables.IPv4Family, tableName)
+				ipv6Fake = knftables.NewFake(knftables.IPv6Family, tableName)
+				pmNFT = &portMapperNFTables{
+					ipv4: ipv4Fake,
+					ipv6: ipv6Fake,
+				}
+			})
+
+			It(fmt.Sprintf("[%s] generates correct rules with masqAll=true for IPv4", ver), func() {
+				configTmpl := `{
+					"name": "test",
+					"type": "portmap",
+					"cniVersion": "%s",
+					"backend": "nftables",
+					"runtimeConfig": {
+						"portMappings": [
+							{ "hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
+						]
+					},
+					"snat": true,
+					"masqAll": true
+				}`
+				configBytes := []byte(fmt.Sprintf(configTmpl, ver))
+
+				conf, _, err := parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+
+				// With masqAll=true, should have only 1 masquerading rule with saddr 0.0.0.0/0
+				expectedRules := strings.TrimSpace(`
+add table ip cni_hostport { comment "CNI portmap plugin" ; }
+add chain ip cni_hostport hostip_hostports
+add chain ip cni_hostport hostports
+add chain ip cni_hostport hostports_all
+add chain ip cni_hostport masquerading { type nat hook postrouting priority 100 ; }
+add chain ip cni_hostport output { type nat hook output priority -100 ; }
+add chain ip cni_hostport prerouting { type nat hook prerouting priority -100 ; }
+add rule ip cni_hostport hostports tcp dport 8080 dnat to 10.0.0.2:80 comment "icee6giejonei6so"
+add rule ip cni_hostport hostports_all jump hostip_hostports
+add rule ip cni_hostport hostports_all jump hostports
+add rule ip cni_hostport masquerading ip saddr 0.0.0.0/0 ip daddr 10.0.0.2 masquerade comment "icee6giejonei6so"
+add rule ip cni_hostport output fib daddr type local jump hostports_all
+add rule ip cni_hostport prerouting fib daddr type local jump hostports_all
+`)
+				actualRules := strings.TrimSpace(ipv4Fake.Dump())
+				Expect(actualRules).To(Equal(expectedRules))
+
+				// Check should pass with 1 masquerading rule
+				err = pmNFT.checkPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			It(fmt.Sprintf("[%s] generates correct rules with masqAll=false for IPv4", ver), func() {
+				configTmpl := `{
+					"name": "test",
+					"type": "portmap",
+					"cniVersion": "%s",
+					"backend": "nftables",
+					"runtimeConfig": {
+						"portMappings": [
+							{ "hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
+						]
+					},
+					"snat": true,
+					"masqAll": false
+				}`
+				configBytes := []byte(fmt.Sprintf(configTmpl, ver))
+
+				conf, _, err := parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+
+				// With masqAll=false, should have 2 masquerading rules: hairpin + localhost
+				expectedRules := strings.TrimSpace(`
+add table ip cni_hostport { comment "CNI portmap plugin" ; }
+add chain ip cni_hostport hostip_hostports
+add chain ip cni_hostport hostports
+add chain ip cni_hostport hostports_all
+add chain ip cni_hostport masquerading { type nat hook postrouting priority 100 ; }
+add chain ip cni_hostport output { type nat hook output priority -100 ; }
+add chain ip cni_hostport prerouting { type nat hook prerouting priority -100 ; }
+add rule ip cni_hostport hostports tcp dport 8080 dnat to 10.0.0.2:80 comment "icee6giejonei6so"
+add rule ip cni_hostport hostports_all jump hostip_hostports
+add rule ip cni_hostport hostports_all jump hostports
+add rule ip cni_hostport masquerading ip saddr 10.0.0.2 ip daddr 10.0.0.2 masquerade comment "icee6giejonei6so"
+add rule ip cni_hostport masquerading ip saddr 127.0.0.1 ip daddr 10.0.0.2 masquerade comment "icee6giejonei6so"
+add rule ip cni_hostport output fib daddr type local jump hostports_all
+add rule ip cni_hostport prerouting fib daddr type local jump hostports_all
+`)
+				actualRules := strings.TrimSpace(ipv4Fake.Dump())
+				Expect(actualRules).To(Equal(expectedRules))
+
+				// Check should pass with 2 masquerading rules
+				err = pmNFT.checkPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			It(fmt.Sprintf("[%s] generates correct rules with masqAll=true for IPv6", ver), func() {
+				configTmpl := `{
+					"name": "test",
+					"type": "portmap",
+					"cniVersion": "%s",
+					"backend": "nftables",
+					"runtimeConfig": {
+						"portMappings": [
+							{ "hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
+						]
+					},
+					"snat": true,
+					"masqAll": true
+				}`
+				configBytes := []byte(fmt.Sprintf(configTmpl, ver))
+
+				conf, _, err := parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet6)
+				Expect(err).NotTo(HaveOccurred())
+
+				// With masqAll=true for IPv6, should have only 1 masquerading rule with saddr ::/0
+				expectedRules := strings.TrimSpace(`
+add table ip6 cni_hostport { comment "CNI portmap plugin" ; }
+add chain ip6 cni_hostport hostip_hostports
+add chain ip6 cni_hostport hostports
+add chain ip6 cni_hostport hostports_all
+add chain ip6 cni_hostport masquerading { type nat hook postrouting priority 100 ; }
+add chain ip6 cni_hostport output { type nat hook output priority -100 ; }
+add chain ip6 cni_hostport prerouting { type nat hook prerouting priority -100 ; }
+add rule ip6 cni_hostport hostports tcp dport 8080 dnat to [2001:db8::2]:80 comment "icee6giejonei6so"
+add rule ip6 cni_hostport hostports_all jump hostip_hostports
+add rule ip6 cni_hostport hostports_all jump hostports
+add rule ip6 cni_hostport masquerading ip6 saddr ::/0 ip6 daddr 2001:db8::2 masquerade comment "icee6giejonei6so"
+add rule ip6 cni_hostport output fib daddr type local jump hostports_all
+add rule ip6 cni_hostport prerouting fib daddr type local jump hostports_all
+`)
+				actualRules := strings.TrimSpace(ipv6Fake.Dump())
+				Expect(actualRules).To(Equal(expectedRules))
+
+				// Check should pass with 1 masquerading rule
+				err = pmNFT.checkPorts(conf, *containerNet6)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			It(fmt.Sprintf("[%s] generates correct rules with masqAll=false for IPv6", ver), func() {
+				configTmpl := `{
+					"name": "test",
+					"type": "portmap",
+					"cniVersion": "%s",
+					"backend": "nftables",
+					"runtimeConfig": {
+						"portMappings": [
+							{ "hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
+						]
+					},
+					"snat": true,
+					"masqAll": false
+				}`
+				configBytes := []byte(fmt.Sprintf(configTmpl, ver))
+
+				conf, _, err := parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet6)
+				Expect(err).NotTo(HaveOccurred())
+
+				// With masqAll=false for IPv6, should have 1 masquerading rule (no localhost for IPv6)
+				expectedRules := strings.TrimSpace(`
+add table ip6 cni_hostport { comment "CNI portmap plugin" ; }
+add chain ip6 cni_hostport hostip_hostports
+add chain ip6 cni_hostport hostports
+add chain ip6 cni_hostport hostports_all
+add chain ip6 cni_hostport masquerading { type nat hook postrouting priority 100 ; }
+add chain ip6 cni_hostport output { type nat hook output priority -100 ; }
+add chain ip6 cni_hostport prerouting { type nat hook prerouting priority -100 ; }
+add rule ip6 cni_hostport hostports tcp dport 8080 dnat to [2001:db8::2]:80 comment "icee6giejonei6so"
+add rule ip6 cni_hostport hostports_all jump hostip_hostports
+add rule ip6 cni_hostport hostports_all jump hostports
+add rule ip6 cni_hostport masquerading ip6 saddr 2001:db8::2 ip6 daddr 2001:db8::2 masquerade comment "icee6giejonei6so"
+add rule ip6 cni_hostport output fib daddr type local jump hostports_all
+add rule ip6 cni_hostport prerouting fib daddr type local jump hostports_all
+`)
+				actualRules := strings.TrimSpace(ipv6Fake.Dump())
+				Expect(actualRules).To(Equal(expectedRules))
+
+				// Check should pass with 1 masquerading rule
+				err = pmNFT.checkPorts(conf, *containerNet6)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			It(fmt.Sprintf("[%s] checkPorts validates correct rule count with masqAll", ver), func() {
+				configTmpl := `{
+					"name": "test",
+					"type": "portmap",
+					"cniVersion": "%s",
+					"backend": "nftables",
+					"runtimeConfig": {
+						"portMappings": [
+							{ "hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
+						]
+					},
+					"snat": true,
+					"masqAll": %t
+				}`
+
+				// Test masqAll=true: expects 1 rule
+				configBytes := []byte(fmt.Sprintf(configTmpl, ver, true))
+				conf, _, err := parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+
+				// Should pass with 1 rule
+				err = pmNFT.checkPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+
+				// Clear the fake nftables
+				ipv4Fake = knftables.NewFake(knftables.IPv4Family, tableName)
+				pmNFT.ipv4 = ipv4Fake
+
+				// Test masqAll=false: expects 2 rules
+				configBytes = []byte(fmt.Sprintf(configTmpl, ver, false))
+				conf, _, err = parseConfig(configBytes, "foo")
+				Expect(err).NotTo(HaveOccurred())
+				conf.ContainerID = containerID
+
+				err = pmNFT.forwardPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+
+				// Should pass with 2 rules
+				err = pmNFT.checkPorts(conf, *containerNet4)
+				Expect(err).NotTo(HaveOccurred())
+			})
+		})
 	}
 })
diff --git a/plugins/meta/sbr/main.go b/plugins/meta/sbr/main.go
index 7379a01ea..c89fdeda6 100644
--- a/plugins/meta/sbr/main.go
+++ b/plugins/meta/sbr/main.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/alexflint/go-filemutex"
 	"github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
 
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
@@ -49,6 +50,16 @@ type PluginConf struct {
 
 	// Add plugin-specific flags here
 	Table *int `json:"table,omitempty"`
+	// Gateways allows specifying static/hardcoded gateway IP addresses
+	// If set, these will be used instead of the gateway from prevResult
+	// Supports dual-stack: provide one IPv4 and/or one IPv6 gateway
+	// Note: Currently applies the same gateway to all IPs of the same family.
+	// Per-subnet gateway mapping is not yet supported.
+	Gateways []string `json:"gateways,omitempty"`
+	// AddSourceHints adds source IP hints to subnet routes in the main table,
+	// enabling destination-based routing when no explicit source IP is specified.
+	// This allows both source-based and destination-based routing to work together.
+	AddSourceHints bool `json:"addSourceHints,omitempty"`
 }
 
 // Wrapper that does a lock before and unlock after operations to serialise
@@ -168,7 +179,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 		if conf.Table != nil {
 			return doRoutesWithTable(ipCfgs, *conf.Table)
 		}
-		return doRoutes(ipCfgs, args.IfName)
+		return doRoutes(ipCfgs, args.IfName, conf.Gateways, conf.AddSourceHints)
 	})
 	if err != nil {
 		return err
@@ -207,7 +218,7 @@ func getNextTableID(rules []netlink.Rule, routes []netlink.Route, candidateID in
 }
 
 // doRoutes does all the work to set up routes and rules during an add.
-func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
+func doRoutes(ipCfgs []*current.IPConfig, iface string, staticGateways []string, addSourceHints bool) error {
 	// Get a list of rules and routes ready.
 	rules, err := netlinksafe.RuleList(netlink.FAMILY_ALL)
 	if err != nil {
@@ -238,6 +249,33 @@ func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
 		return fmt.Errorf("Unable to list routes: %v", err)
 	}
 
+	// Parse static gateways if provided (supports dual-stack: one IPv4, one IPv6)
+	var staticGwV4, staticGwV6 net.IP
+	if len(staticGateways) > 2 {
+		return fmt.Errorf("gateways list cannot contain more than 2 entries (one IPv4, one IPv6)")
+	}
+	for _, gw := range staticGateways {
+		ip := net.ParseIP(gw)
+		if ip == nil {
+			return fmt.Errorf("invalid static gateway IP address: %s", gw)
+		}
+		if ip.To4() != nil {
+			if staticGwV4 != nil {
+				// We already have an IPv4 static gateway
+				return fmt.Errorf("gateways list contains multiple IPv4 addresses: %s and %s", staticGwV4, gw)
+			}
+			staticGwV4 = ip
+			log.Printf("Using static IPv4 gateway: %s", ip)
+		} else {
+			if staticGwV6 != nil {
+				// We already have an IPv6 static gateway
+				return fmt.Errorf("gateways list contains multiple IPv6 addresses: %s and %s", staticGwV6, gw)
+			}
+			staticGwV6 = ip
+			log.Printf("Using static IPv6 gateway: %s", ip)
+		}
+	}
+
 	// Loop through setting up source based rules and default routes.
 	for _, ipCfg := range ipCfgs {
 		log.Printf("Set rule for source %s", ipCfg.String())
@@ -260,10 +298,24 @@ func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
 			return fmt.Errorf("Failed to add rule: %v", err)
 		}
 
+		// Determine which gateway to use: static gateway takes precedence
+		// Match gateway by IP family (IPv4 vs IPv6)
+		var gateway net.IP
+		isIPv4 := ipCfg.Address.IP.To4() != nil
+
+		switch {
+		case isIPv4 && staticGwV4 != nil:
+			gateway = staticGwV4
+		case !isIPv4 && staticGwV6 != nil:
+			gateway = staticGwV6
+		case ipCfg.Gateway != nil:
+			gateway = ipCfg.Gateway
+		}
+
 		// Add a default route, since this may have been removed by previous
 		// plugin.
-		if ipCfg.Gateway != nil {
-			log.Printf("Adding default route to gateway %s", ipCfg.Gateway.String())
+		if gateway != nil {
+			log.Printf("Adding default route to gateway %s", gateway.String())
 
 			var dest net.IPNet
 			if ipCfg.Address.IP.To4() != nil {
@@ -276,7 +328,7 @@ func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
 
 			route := netlink.Route{
 				Dst:       &dest,
-				Gw:        ipCfg.Gateway,
+				Gw:        gateway,
 				Table:     table,
 				LinkIndex: linkIndex,
 			}
@@ -284,7 +336,7 @@ func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
 			err = netlink.RouteAdd(&route)
 			if err != nil {
 				return fmt.Errorf("Failed to add default route to %s: %v",
-					ipCfg.Gateway.String(),
+					gateway.String(),
 					err)
 			}
 		}
@@ -320,15 +372,59 @@ func doRoutes(ipCfgs []*current.IPConfig, iface string) error {
 		table = getNextTableID(rules, routes, table)
 	}
 
-	// Delete all the interface routes in the default routing table, which were
-	// copied to source based routing tables.
-	// Not deleting them while copying to accommodate for multiple ipCfgs from
-	// the same subnet. Else, (error for network is unreachable while adding gateway)
-	for _, route := range routes {
-		log.Printf("Deleting route %s from table %d", route.String(), route.Table)
-		err := netlink.RouteDel(&route)
-		if err != nil {
-			return fmt.Errorf("Failed to delete route: %v", err)
+	// Handle routes in the default routing table
+	if addSourceHints {
+		// Keep or re-add subnet routes in main table with source IP hints
+		// for destination-based routing when no explicit source IP is specified
+		log.Printf("Adding source IP hints to subnet routes in main table")
+
+		for _, ipCfg := range ipCfgs {
+			// Find the subnet route for this IP
+			subnet := &net.IPNet{
+				IP:   ipCfg.Address.IP.Mask(ipCfg.Address.Mask),
+				Mask: ipCfg.Address.Mask,
+			}
+
+			log.Printf("Adding/replacing route for subnet %s with src hint %s in main table",
+				subnet.String(), ipCfg.Address.IP.String())
+
+			// Add route to main table with source IP hint
+			route := netlink.Route{
+				LinkIndex: linkIndex,
+				Dst:       subnet,
+				Src:       ipCfg.Address.IP,
+				Table:     unix.RT_TABLE_MAIN,
+				Scope:     netlink.SCOPE_LINK,
+			}
+
+			// Use RouteReplace to update if it exists
+			err := netlink.RouteReplace(&route)
+			if err != nil {
+				log.Printf("Warning: Failed to add subnet route to main table: %v", err)
+				// Don't fail completely, just warn
+			}
+		}
+
+		// Delete non-subnet routes from main table (gateway routes, etc.)
+		for _, route := range routes {
+			// Skip subnet routes (scope link), only delete other routes
+			if route.Scope != netlink.SCOPE_LINK {
+				log.Printf("Deleting non-subnet route %s from table %d", route.String(), route.Table)
+				err := netlink.RouteDel(&route)
+				if err != nil {
+					log.Printf("Warning: Failed to delete route: %v", err)
+				}
+			}
+		}
+	} else {
+		// Not deleting them while copying to accommodate for multiple ipCfgs from
+		// the same subnet. Else, (error for network is unreachable while adding gateway)
+		for _, route := range routes {
+			log.Printf("Deleting route %s from table %d", route.String(), route.Table)
+			err := netlink.RouteDel(&route)
+			if err != nil {
+				return fmt.Errorf("Failed to delete route: %v", err)
+			}
 		}
 	}
 
diff --git a/plugins/meta/sbr/sbr_linux_test.go b/plugins/meta/sbr/sbr_linux_test.go
index d0f872672..1a6b41bbc 100644
--- a/plugins/meta/sbr/sbr_linux_test.go
+++ b/plugins/meta/sbr/sbr_linux_test.go
@@ -628,4 +628,350 @@ var _ = Describe("sbr test", func() {
 		Expect(rules[1].Table).To(Equal(tableID))
 		Expect(rules[1].Src.String()).To(Equal("192.168.1.209/32"))
 	})
+
+	It("Works with static IPv4 gateway configuration", func() {
+		ifname := "net1"
+		// Configure with a static IPv4 gateway (192.168.1.254) that differs from
+		// the gateway in prevResult (192.168.1.1)
+		conf := `{
+	"cniVersion": "0.3.0",
+	"name": "cni-plugin-sbr-test",
+	"type": "sbr",
+	"gateways": ["192.168.1.254"],
+	"prevResult": {
+		"cniVersion": "0.3.0",
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "192.168.1.209/24",
+				"gateway": "192.168.1.1",
+				"interface": 0
+			}
+		],
+		"routes": []
+	}
+}`
+		conf = fmt.Sprintf(conf, ifname, targetNs.Path())
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNs.Path(),
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		err := setup(targetNs, createDefaultStatus())
+		Expect(err).NotTo(HaveOccurred())
+
+		_, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+		Expect(err).NotTo(HaveOccurred())
+
+		newStatus, err := readback(targetNs, []string{"net1", "eth0"})
+		Expect(err).NotTo(HaveOccurred())
+
+		// Check that the static gateway (192.168.1.254) is used instead of
+		// the prevResult gateway (192.168.1.1)
+		Expect(newStatus.Rules).To(HaveLen(1))
+		devNet1 := newStatus.Devices[0]
+
+		// Find the default route in table 100
+		var foundDefaultRoute bool
+		for _, route := range devNet1.Routes {
+			if route.Table == 100 && route.Dst != nil && route.Dst.IP.Equal(net.IPv4zero) {
+				// This is the default route, check the gateway
+				Expect(route.Gw.String()).To(Equal("192.168.1.254"))
+				foundDefaultRoute = true
+				break
+			}
+		}
+		Expect(foundDefaultRoute).To(BeTrue(), "Expected to find default route with static gateway")
+	})
+
+	It("Works with static IPv6 gateway configuration", func() {
+		ifname := "net1"
+		// Configure with a static IPv6 gateway
+		conf := `{
+	"cniVersion": "0.3.0",
+	"name": "cni-plugin-sbr-test",
+	"type": "sbr",
+	"gateways": ["fd00::1"],
+	"prevResult": {
+		"cniVersion": "0.3.0",
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "6",
+				"address": "fd00::10/64",
+				"gateway": "fd00::ffff",
+				"interface": 0
+			}
+		],
+		"routes": []
+	}
+}`
+		conf = fmt.Sprintf(conf, ifname, targetNs.Path())
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNs.Path(),
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		preStatus := createDefaultStatus()
+		// Replace IPv4 address with IPv6 on net1
+		preStatus.Devices[1].Addrs = []net.IPNet{
+			{
+				IP:   net.ParseIP("fd00::10"),
+				Mask: net.CIDRMask(64, 128),
+			},
+		}
+		// Replace IPv4 routes with empty (IPv6 routes are auto-created)
+		preStatus.Devices[1].Routes = []netlink.Route{}
+
+		err := setup(targetNs, preStatus)
+		Expect(err).NotTo(HaveOccurred())
+
+		_, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+		Expect(err).NotTo(HaveOccurred())
+
+		newStatus, err := readback(targetNs, []string{"net1", "eth0"})
+		Expect(err).NotTo(HaveOccurred())
+
+		// Check that the static gateway (fd00::1) is used instead of
+		// the prevResult gateway (fd00::ffff)
+		Expect(newStatus.Rules).To(HaveLen(1))
+		devNet1 := newStatus.Devices[0]
+
+		// Find the default route in table 100
+		var foundDefaultRoute bool
+		for _, route := range devNet1.Routes {
+			if route.Table == 100 && route.Dst != nil && route.Dst.IP.Equal(net.IPv6zero) {
+				// This is the default route, check the gateway
+				Expect(route.Gw.String()).To(Equal("fd00::1"))
+				foundDefaultRoute = true
+				break
+			}
+		}
+		Expect(foundDefaultRoute).To(BeTrue(), "Expected to find IPv6 default route with static gateway")
+	})
+
+	It("Works with dual-stack static gateway configuration", func() {
+		ifname := "net1"
+		// Configure with both IPv4 and IPv6 static gateways
+		conf := `{
+	"cniVersion": "0.3.0",
+	"name": "cni-plugin-sbr-test",
+	"type": "sbr",
+	"gateways": ["192.168.1.254", "fd00::1"],
+	"prevResult": {
+		"cniVersion": "0.3.0",
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "192.168.1.209/24",
+				"gateway": "192.168.1.1",
+				"interface": 0
+			},
+			{
+				"version": "6",
+				"address": "fd00::10/64",
+				"gateway": "fd00::ffff",
+				"interface": 0
+			}
+		],
+		"routes": []
+	}
+}`
+		conf = fmt.Sprintf(conf, ifname, targetNs.Path())
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNs.Path(),
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		preStatus := createDefaultStatus()
+		// Add IPv6 address alongside IPv4 on net1
+		preStatus.Devices[1].Addrs = append(preStatus.Devices[1].Addrs,
+			net.IPNet{
+				IP:   net.ParseIP("fd00::10"),
+				Mask: net.CIDRMask(64, 128),
+			})
+
+		err := setup(targetNs, preStatus)
+		Expect(err).NotTo(HaveOccurred())
+
+		_, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+		Expect(err).NotTo(HaveOccurred())
+
+		newStatus, err := readback(targetNs, []string{"net1", "eth0"})
+		Expect(err).NotTo(HaveOccurred())
+
+		// Check that both IPv4 and IPv6 rules were created
+		Expect(newStatus.Rules).To(HaveLen(2))
+		devNet1 := newStatus.Devices[0]
+
+		// Find both default routes
+		var foundIPv4Route, foundIPv6Route bool
+		for _, route := range devNet1.Routes {
+			if route.Table >= 100 && route.Dst != nil {
+				if route.Dst.IP.Equal(net.IPv4zero) && route.Gw != nil {
+					Expect(route.Gw.String()).To(Equal("192.168.1.254"))
+					foundIPv4Route = true
+				}
+				if route.Dst.IP.Equal(net.IPv6zero) && route.Gw != nil {
+					Expect(route.Gw.String()).To(Equal("fd00::1"))
+					foundIPv6Route = true
+				}
+			}
+		}
+		Expect(foundIPv4Route).To(BeTrue(), "Expected to find IPv4 default route with static gateway")
+		Expect(foundIPv6Route).To(BeTrue(), "Expected to find IPv6 default route with static gateway")
+	})
+
+	It("Rejects multiple IPv4 gateways", func() {
+		ifname := "net1"
+		// Configure with two IPv4 gateways (should fail)
+		conf := `{
+	"cniVersion": "0.3.0",
+	"name": "cni-plugin-sbr-test",
+	"type": "sbr",
+	"gateways": ["192.168.1.1", "192.168.1.254"],
+	"prevResult": {
+		"cniVersion": "0.3.0",
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "192.168.1.209/24",
+				"gateway": "192.168.1.1",
+				"interface": 0
+			}
+		],
+		"routes": []
+	}
+}`
+		conf = fmt.Sprintf(conf, ifname, targetNs.Path())
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNs.Path(),
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		preStatus := createDefaultStatus()
+		err := setup(targetNs, preStatus)
+		Expect(err).NotTo(HaveOccurred())
+
+		_, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+		Expect(err).To(HaveOccurred())
+		Expect(err.Error()).To(ContainSubstring("multiple IPv4 addresses"))
+	})
+
+	It("Works with addSourceHints enabled", func() {
+		ifname := "net1"
+		conf := `{
+	"cniVersion": "0.3.0",
+	"name": "cni-plugin-sbr-test",
+	"type": "sbr",
+	"addSourceHints": true,
+	"prevResult": {
+		"cniVersion": "0.3.0",
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "192.168.1.209/24",
+				"gateway": "192.168.1.1",
+				"interface": 0
+			}
+		],
+		"routes": []
+	}
+}`
+		conf = fmt.Sprintf(conf, ifname, targetNs.Path())
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNs.Path(),
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		err := setup(targetNs, createDefaultStatus())
+		Expect(err).NotTo(HaveOccurred())
+
+		_, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+		Expect(err).NotTo(HaveOccurred())
+
+		newStatus, err := readback(targetNs, []string{"net1", "eth0"})
+		Expect(err).NotTo(HaveOccurred())
+
+		// Check that source-based routing rule was created
+		Expect(newStatus.Rules).To(HaveLen(1))
+		Expect(newStatus.Rules[0].Table).To(Equal(100))
+		Expect(newStatus.Rules[0].Src.String()).To(Equal("192.168.1.209/32"))
+
+		devNet1 := newStatus.Devices[0]
+
+		// Check that routes exist in both table 100 (source-based) and
+		// table 254/main (for destination-based routing)
+		var foundSubnetRouteInMain bool
+		var foundSubnetRouteInTable100 bool
+		var foundDefaultRouteInTable100 bool
+
+		for _, route := range devNet1.Routes {
+			// Look for subnet route (192.168.1.0/24) in main table with source hint
+			if route.Dst != nil && route.Dst.IP.Equal(net.IPv4(192, 168, 1, 0)) &&
+				route.Dst.Mask.String() == "ffffff00" {
+				if route.Table == 254 || route.Table == 0 { // 0 is treated as main
+					Expect(route.Src.String()).To(Equal("192.168.1.209"),
+						"Subnet route in main table should have source IP hint")
+					Expect(route.Scope).To(Equal(netlink.SCOPE_LINK))
+					foundSubnetRouteInMain = true
+				}
+				if route.Table == 100 {
+					foundSubnetRouteInTable100 = true
+				}
+			}
+
+			// Look for default route in table 100
+			if route.Table == 100 && route.Dst != nil && route.Dst.IP.Equal(net.IPv4zero) {
+				Expect(route.Gw.String()).To(Equal("192.168.1.1"))
+				foundDefaultRouteInTable100 = true
+			}
+		}
+
+		Expect(foundSubnetRouteInMain).To(BeTrue(),
+			"Expected subnet route in main table with source hint")
+		Expect(foundSubnetRouteInTable100).To(BeTrue(),
+			"Expected subnet route in table 100 for source-based routing")
+		Expect(foundDefaultRouteInTable100).To(BeTrue(),
+			"Expected default route in table 100")
+	})
 })