Merge "Added DatabaseBase::startAtomic and endAtomic"