[boost] Merging fixes from MAIN to RC?