[boost] Bug Sprint merge from trunk to release branche