rename Standalone to Adapter
Merge branch 'master' into adapter