Improve SQL limits auto-configuration.
Improve SQL limits auto-configuration (2)