Merged to core-8-5-branch [b6459ef66c] and to trunk [eb0919a1ec].

Phil Hoffman tested succesfully with the attached script.

Bug closed, thank you all,

Harald