No functionally changes. Submitted by: Oleg Karachevtsev <ok@etrust.ru> A part of PR: 57992
PR: 33853 Submitted by: chuynh@biolateral.com.au