Merge branch 'improve/freebsd-rc-script' into 'develop'