Merge "Fix N_SE-37982/43990" into tizen_2.2