PR: 37192 Submitted by: Lev A. Serebryakov <lev@serebryakov.spb.ru>
PR: 35002 Submitted by: Lev Serebryakov <lev@serebryakov.spb.ru>