Sync with FreeBSD STABLE (271293)