* Fix new devel sanity errors. (#3194) (cherry picked from commit 1fec1d0c81449fb4fc3dea9de362a27de7c1fbda) * Add two more. * Fix PR #. Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit 1a3c2219958d389ba7dde42571e343f1b57534de) Co-authored-by: patchback[bot] <45432694+patchback[bot]@users.noreply.github.com>