[boost] Release branch merge