PR: 22199 Submitted by: Roman Shterenzon <roman@xpert.com> MAINTAINER
PR: 21670, 21778 Submitted by: Roman Shterenzon <roman@xpert.com>