fixed db connection settings and added proper discard on cancel
Merge branch 'master' into peerseverywhere