adjust for hammer 0.4
Merge branch 'dev'