Cm 10.1 3.0

Hi Arne,
these commits add the latest changes already included to 3.4 branch.

I wish you a nice evening.
Thank you!