[boost] unmerged changes in boost function