Last changes to make clear the new api needs
Merge branch 'release/cyni-samples-v0.2'