Merge proposals

vc15lin has no merge proposals.