Merge "BQ: Fix segfault in dump()" into nyc-dev