Merge branch 'fg/maint-exclude-bq' into maint