Merge branch 'cls_u32_hw_sw'