Merge code from vera