Code enhancement
Manual merge