Merge branch 'nd/fbsd-lazy-mtime' into maint