adapters
Merge branch 'adapters'