Merge branch 'devel/master (1.2.39+)' into tizen