Fix for #387
Fix for #354
Fix for database connection consumption bug #535
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x