@ansgar , can you take care of this, please?
I'll file a new merge request for this change as this one asks to merge the changes from master into releases/2.5.
master
releases/2.5
closed