Merge branch 'clearhw'