Merge "Move more code that uses BQL to use BLAST layer" into sc-dev