[boost] ATTN: Merging changes to the release branch