Merge branch 't/web_improvements'