PR: 52119 Submitted by: Sergei Kolobov <sergei@kolobov.com>
PR: 51814 Submitted by: Sergei Kolobov <sergei@kolobov.com>