[2171474] Please merge 9.12 into Tenacious

https://bugs.launchpad.net/bugs/2171474