Code

Merge branch 'fg/exclude-bq'