Merge "fix proxy connection's keep alive" into main