catching up on missed auto-merged stuff from #3122

manually merged parts which got "ignored" by the auto-merge strategy for the BOOSTIO branch.
Please merge.