Merge "Fix for N_SE-34569" into tizen_2.1