Merge to upstream 3.12.22
Fix disk initialization failures on FreeBSD
Release 3.0.66.1