(cherry picked from commit 6002acf376556eb413a6b514f14b8a07f8de5099) Another sql fix (cherry picked from commit 204acbb5b72d9706cdcf26aede62c2eeec11c6a2)
(cherry picked from commit 6002acf376556eb413a6b514f14b8a07f8de5099) Another sql fix (cherry picked from commit 204acbb5b72d9706cdcf26aede62c2eeec11c6a2)