Merge "Fix bug[N_SE-37282]" into tizen_2.1