Bug fixed for cextent
Merge conflict