Merge "Adjust initCheck to compare against OK instead"