Merge "Introduced additional lock - dbLock"