Merge remote-tracking branch 'brian/devel' into claw