[boost] Tickets 6123 an 7023

Hi, Is anyone willing to commit these patches for me? If the process is not too involved I don't mind rtfm & DIY as an answer. Cheers, Luke