Merge "Fix for CID:860302" into tizen