Merge updates from Upstream
Type of change
- Bug fix (non-breaking change which fixes an issue)
- This change requires a documentation update
How has this been tested?
By monitoring outgoing network using Netgaurd App or Wireshark on pc
- I have performed a self-review of my own code
- I have made corresponding changes to the documentation