Updated 'basic' branch with recent changes from "exchange-share-demo"