No ticket: Reduce size in anticipation of Sizzle-free builds
(cherry picked from commit dbf3056b250bbc279fa947031181f9e25a40bacf)
No ticket: Revise unit tests in anticipation of Sizzle-free builds
Fix #13499: selector with leading ID matching only a name
(cherry picked from commit 5c4ab97a64c162503ac200bc7cea7f3e5725984d)