As I suggested, I think is better to split this patch in two patches
since we are fixing two issues. This should also simplify to attach the
proper 'Fixes' tag.
Splitting also allows to put the reporter in the right issue he
reported.
I agree it makes sense to split it. I will send separate patches in a few hours.
Norbert