I've just added some info to those bugs on a possible upstream stable fix.