https://github.com/389ds/389-ds-base/pull/4546

FYI: FirstYear has already reviewed the code (Thank you William !) but due to the size and the complexity of the change, it would be better if two other reviewers could also have a look at it. 
--