[Boost] Integrated the patch from Radu Greab (#921134).