Hi,

here are updated patches rebased on core-update branch.

----
Petr