Merge with R2 mpawlak