Some small work on native sides
merge conflict