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