Merge branch 'jc/maint-fbsd-sh-ifs-workaround'