Update with freebsd -HEAD modification 252727