Depends On D115742
Nit: I find this error message quite cryptic -- what is "1"? Expected rank? Actual rank? Of what? I see that it is not introduced by this patch, but if you can fix that in a separate follow-up, it would be appreciated.