[boost] [units] unmerged changes in develop