TBD-1145 : Backport TBD-1128 to branch 5.5.