Merge "Added row based extend borders"