TDI-27279:backport on 5.5.