rebase - based on Laurenz's patch set

Regards

Pavel