Merge "BLAST: Handle detached layers."