Merge branch 'bl/gitweb-project-filter' into next