Merge remote-tracking branch 'origin/master' into eugenia/web_ui_beta_fixes