Merge branch 'devel/masteri (1.2.36+)' into tizen