Reverting change for DB shutdown
Merge branch 'master' into 0_6_X