; and and inserting a semicolon; (2) in subparagraph (N), by striking the period at the end and inserting ; and ; and (3) by adding at the end the following: (O) as required, when assessing and developing prototype nuclear weapons of foreign countries, a report from the directors of the national security laboratories on the need and plan for such assessment and development that includes separate comments on the plan from the Secretary of Energy and the Director of National Intelligence. . (b) Stockpile responsiveness program Section 4220(c) of the Atomic Energy Defense Act ( 50 U.S.C. 2538b(c) ) is amended by adding at the end the following: (6) The retention of the ability, in consultation with the Director of National Intelligence, to assess and develop prototype nuclear weapons of foreign countries and, if necessary, to conduct no-yield testing of those prototypes. . (c) Conforming repeal (1) In general Section 4509 of the Atomic Energy Defense Act ( 50 U.S.C. 2660 ) is repealed. (2) Clerical amendment The table of contents for the Atomic Energy Defense Act is amended by striking the items relating to sections 4508 and 4509. 3112. Use of funds for construction and project support activities relating to MOX facility (a) In general Except as provided by subsection (b), the Secretary of Energy shall carry out construction and project support activities relating to the MOX facility using funds authorized to be appropriated by this Act or otherwise made available for fiscal year 2018 for the National Nuclear Security Administration for the MOX facility for construction and project support activities. (b) Waiver (1) In general The Secretary may waive the requirement under subsection (a) to carry out construction and project support activities relating to the MOX facility if the Secretary submits to the congressional defense committees— (A) the commitment of the Secretary to remove plutonium intended to be disposed of in the MOX facility from South Carolina and ensure a sustainable future for the Savannah River Site