0.16 FreeBSD required cherry picks