Merge branch 'roman_devel' into tizen