Support for choosing adapter in the sample suite
Final adjustments to the nolib