Merge pull request #27759 from xedin/port-keypath-diags

[Diagnostics] Port more key path related failures to new framework

Author: xedin