@Danny Please find attached patches. Regards, RG.