Merge remote-tracking branch 'nsz/bsd'