Merge branch 'fix_hardwarecode'

UCC git Repository :: git.ucc.asn.au