Merge branch 'new_boost'