Merge branch 'master' into docs/web-ui-guide-polish

Merge branch 'master' into docs/web-ui-guide-polish