v2.3.8 Release Branch SQL fix
SQL Fix