; and (2) in paragraph (6), by striking 2025 and inserting 2026 . D Additional Amendments to the Consolidated Farm and Rural Development Act 6401. Water, waste disposal, and wastewater facility grants Section 306(a)(2)(B)(vii) of the Consolidated Farm and Rural Development Act ( 7 U.S.C. 1926(a)(2)(B)(vii) ) is amended by striking 2019 through 2023 and inserting 2025 through 2029 . 6402. Rural water and wastewater circuit rider program Section 306(a)(22) of the Consolidated Farm and Rural Development Act ( 7 U.S.C. 1926(a)(22) ) is amended to read as follows: (22) Rural water and wastewater circuit rider program (A) Establishment The Secretary, through the Rural Utilities Service, shall continue a national rural water and wastewater circuit rider program that is consistent with the activities and results of the program conducted before the date of enactment of this Act, and with this section, as determined by the Secretary. (B) Purpose The Rural Water and Wastewater Circuit Rider Program shall provide a network of expert rural water Circuit Riders located in all 50 States, including United States territories and Freely Associated States, which work one-on-one with eligible rural water and wastewater systems in major assistance categories described in subparagraph (D). The program is intended to help rural water systems operate effectively and efficiently and achieve long-term sustainability and compliance with certain Federal laws and requirements, including the Safe Water Drinking Act ( 42 U.S.C. 300f et seq. ) and the Clean Water Act ( 33 U.S.C. 1251 et seq. ). (C) Eligible entities In selecting recipients of grants, contracts, and cooperative agreements to be made available for activities listed under subparagraph (D), the Secretary shall select nonprofit organizations that have demonstrated experience providing technical assistance and disaster and recovery assistance for water and wastewater utilities nationwide. Awardees shall rely on personnel that possess active water and wastewater operators’ licenses or