could somebody have a look at the tickets #4039, #4046, #4045 and give me some feedback. I would like to know if my patches are ok or if I have to fix anything or if I have to add anything etc..