I've just tested the patches on my notebook, too. Also here, the problem is
fixed, with the patches you provided.

Do you already know, in which upstream versions, the fix will be published?
3.17? Or in an 3.16.x already?