we can improve this in part3 or 4, this PR is in sync with part2 that went
in 71X.