Pins the resolver against the node shapes #2032 and the rationale pass produce, plus end-to-end runs of the issue's repro and the comment control that was never broken. (cherry picked from commit 3b04706956)
3b04706956
