am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport

Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a'

* commit 'b643cbe55852b01f1ab81da76d841b58d890276a':
  Add necessary logic removed during backport
tree: a54f4e7df9f004f79abb683ac586ce1a4f63f6d6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE