Merge pull request #23821 from arjantijms/jakartaupdate

Jakarta API updates