PR: 73531 Submitted by: Alexander Novitsky <alecn2002@yandex.ru>
PR: 68193 Submitted by: Alexander Novitsky <alecn2002@yandex.ru>