Hotline #24489 #24486 fix sql patchs

Merge request reports