This PR has been merged and released as 2.10.0.33-SNAPSHOT
https://luceeserver.atlassian.net/browse/LDEV-3279