First commit from r2-pree
Resolve conflict