[Bug 225622] Merge Review: boost