Forward port updates from Bookworm
This package was dropped after the rebase since java was dropped. Now that java is back we need this package, however, the branching was done based on a wrong branch. Forward port updates from Bookworm to fix the issue.