Hi,

I rebased my changes on top of the current core-updates HEAD.

Cheers,
Lars