Misc shallow merge/sync from docking designed to faciliate cross-merging between docking and string_view.
4 files changed