Merge "1373513 has been fixed, remove skip"