Thank you, Thomas, for the contribution.
Proposed for testing in branch [5634c2dfd1].

Could another user please test the new version ?

Thank you,
Harald