Do not merge -- for review purposes only, teasing out truncate changes from boost153 changes.