Merge master os genio

Merged open source changes to master