Merge remote-tracking branch 'austin/claw' into claw