Hi Danny!

I have split and re-worked remaining patches for current core-updates. 
Please find them attached.

Regards,
RG.