Commit system update work

Hey Guys,

Here are the manually applied patches for the system update work. Please have a look!

Thanks,
-Karol