Test and optimize database query response time
Merge remote-tracking branch 'origin/Branch-chyb' into Branch-chyb