@Danny

Please find the revised patches.

@Tobias

I have fixed the commit message.

Regards,
RG.