### Description Backport all relevant points for 7.1.1: https://github.com/eclipse-ee4j/glassfish/issues/25916 Plus: - [x] https://github.com/eclipse-ee4j/glassfish/pull/25707 (already in 7.1.x) - added to 7.0 with https://github.com/eclipse-ee4j/glassfish/pull/25950 - [ ] Patch and upgrade DerbyDB 10.15.2.1: https://issues.apache.org/jira/browse/DERBY-7147
Description
Backport all relevant points for 7.1.1: #25916
Plus: