Merge "Revert "Remove @Ignore from class level""