Kindly review these commits

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234979 

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236902