[boost] merge to master?