Compiled against develop bransh of core-sdk
Merge branch 'develop' into feature/fixed_layout_and_more
Merge branch 'feature/fixed_layout_and_more' into develop