Merge remote-tracking branch 'upstream/dev' into theme_switcher

.dockerignore

@@ -5,6 +5,7 @@
 # Only add necessary files to the Docker build context (Dockerfiles are always included implicitly)
 !/build/
 !/internal/
+!/pkg/
 !/go.mod
 !/go.sum
 !main.go