Merge "Fix N_SE-27968" into tizen_2.1