Merge "remove skip attributes for fixed bug"