enabling database reconnection for more robust behavior
Merge origin/master