[PATCH 0/2] MR6247: odbc32 fix regressions