Merge branch 'fix-osx-bsd-build' into integration-branch
Merge branch 'fix-jump-offset-header-based' into integration-branch