Merge pull request #23826 from arjantijms/jakarta_update3

Jakarta update3