Small code changes as part of moving the framework SDK forward to a 2.0 dev version.
Attach a file by drag & drop or click to upload
