Merge branch 'master' into eugenia/web_ui_beta_fixes