Master bug#10320

Hi Martin,
I think, it is well. Please tell me if I could work something else.

Regards