Merge "fixed bug (N_SE-41584)" into tizen_2.2