PR: 56168 Submitted by: Sergey Matveychuk <sem@ciam.ru> Reviewed by: Andy Fawcett <andy@athame.co.uk>