@muellese @ottor : please check if this can be merged. I did not had a look at the diff, sorry for that.