Merge "Don't pass USE INDEX to a $dbType parameter" into REL1_31