the following new subsection (a): (a) Property and fiscal officer for each State (1) The Chief of the National Guard Bureau shall assign, designate, or detail, subject to the approval of the Secretary of the Army or the Secretary of the Air Force, as applicable, a qualified commissioned officer ordered to active duty in the National Guard Bureau under section 12402(a) of title 10 to be the property and fiscal officer of each State, Territory, and the District of Columbia. (2) (A) An officer may not be assigned, designated, or detailed as the property and fiscal officer of a State, Territory, or the District of Columbia under paragraph (1) if the officer has served within such jurisdiction during the 36 months preceding such assignment, designation, or detail. (B) The Secretary of the Army or the Secretary of the Air Force may waive the applicability of subparagraph (A) to the assignment, designation, or detail of a particular officer if such Secretary considers the waiver to be in the best interests of the State, Territory, or District of Columbia, as applicable, concerned. (3) An officer assigned, designated, or detailed as a property and fiscal officer under paragraph (1) shall, while so serving as such an officer, serve in a grade commensurate with the functions and responsibilities of the officer, but not above the grade of colonel.