hw 3.1 done
Merge branch 'release/hw-3.1'