TDQ-9283 backport to branch5.5