Merge "Fix for failing test of testEOS because checksum takes too long"