Merge eugenia/web_ui_beta_fixes into madhusudancs/error-reporting.