Merge "Fix a svace 20384" into tizen