chore(web): Merge remote-tracking branch 'origin/master' into chore/web/infrastructure-build-on-linux