Merge "Moved DBConnRef to a separate file"