Backport of #5714 to 72X