Merge branch 'main' into marko/gomod_change

.github/CODEOWNERS

@@ -1,8 +1,8 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
-*       @AdityaSripal @damiannolan @DimitrisJim @gjermundgaraba @bznein
+*       @AdityaSripal @damiannolan @DimitrisJim @gjermundgaraba
 
-# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner @chatton
+# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner @chatton @bznein
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only