The problem most recent showed up in Azure, so test that it is fixed oee https://reviews.freebsd.org/D41728 and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267654. Before these fixes were applied, it was confirmed that these changes also fixed the issue in Azure.