PR: 31797 Submitted by: Petr Rehor <petr.dehor@decros.cz>
PR: 19752 Submitted by: Dmitry S. Sivachenko <dima@Chg.RU>