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