Merge branch working into tizen