Patches for Check hardware changes [sf#1060803] [#312]