Fixes in polish sql scripts
Merge remote branch 'origin/2.8.x' into 2.8.x