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