BUG: 319134 CCBUG: 298248 (cherry picked from commit 6b3b77e8)
mentioned in merge request !86 (closed)