Merge "BLAST: Descriptive adapter layer names" into rvc-dev