; and (2) by adding at the end the following new paragraph: (2) If the Secretary of the Navy elects to convene a selection board under section 611(a) of this title to consider eligible officers for selection to appointment as Staff Judge Advocate, the Secretary may, in connection with such consideration for selection— (A) treat any section in chapter 36 of this title referring to promotion to the next higher grade as if such section referred to promotion to a higher grade; and (B) waive section 619(a)(2) of this title if the Secretary determines that the needs of the Marine Corps require the waiver. . (b) Deputy Judge Advocate General of the Navy Section 5149(a) of such title is amended by adding at the end the following new paragraph: (3) If the Secretary of the Navy elects to convene a selection board under section 611(a) of this title to consider eligible officers for selection to appointment as Deputy Judge Advocate General, the Secretary may, in connection with such consideration for selection— (A) treat any section in chapter 36 of this title referring to promotion to the next higher grade as if such section referred to promotion to a higher grade; and (B) waive section 619(a)(2) of this title if the Secretary determines that the needs of the Navy require the waiver. . 505. Repeal of requirement for specification of number of officers who may be recommended for early retirement by a Selective Early Retirement Board Section 638a of title 10, United States Code, is amended— (1) in subsection (c)— (A) by striking paragraph (1); and (B) by redesignating paragraphs (2) through (4) as paragraphs (1) through (3), respectively; and (2) in subsection (d)— (A) by striking paragraph (2)