fixed failing EDB integration test
Merge remote-tracking branch 'upstream/master' into sync