Merge "If onegrid is on we don't check if destination db is new or not" into main