Update page view
Manually merge with upstream
Update panel editor for further enhanced editing