Thank you, Gerhard and Christian, for the ticket.

Please verify commit [c8c94e175f] if it is ok for you.

Thank you,
Harald