Merge branch 'austin/claw' into claw