Merge "Implenment on demand border extension. In place extend the border now. Next commit will totally remove the border."