(cherry picked from commit d1a053e4f5) Rename sql (cherry picked from commit 41e776fe64)
d1a053e4f5
41e776fe64