PR: 53730, 55647 Submitted by: mat, Sergey Matveychuk <sem@ciam.ru> Approved by: maintainer (implicit)