Lps 51891

CC @zsoltbalogh

Brian, this is a performance regression fix for SP9 release.