PR: 31437 Submitted by: Jon Olsson <jon@joshua.haninge.kth.se>
Submitted by: Oleg Dashevskii <od@iclub.nsu.ru>
Submitted by: Phil Regnauld <regnauld@rh.dk>