merged
https://luceeserver.atlassian.net/browse/LDEV-5945
it has a few issues, I am addressing now as part of
https://luceeserver.atlassian.net/browse/LDEV-5944