db/commit: fix sql error
DB/SAI: Fix crash with quest "Thirst Unending"
Closes #8856
Merge remote-tracking branch 'upstream/master'