Patches for Check hardware changes [sf#1060883] [#307]