Merge branch 'devel-hwmod' into cleanup