Merging latest web_ui changes.