TDQ-9708 backport to 5.5 manually