Merge proposals dependent on lp://staging/~gary-wzl77/net-cpp/fix_1631846

lp://staging/~gary-wzl77/net-cpp/fix_1631846 has no merge proposals.