Merge branch 'feature-bsd-support' into develop