Merge "Fix spelling of "HARDWARE""