Blocking VPN stays as far as no established connection exists.
A bit of EIP refactoring.
Merge branch 'bug/Blocking-VPN-sometimes-dissapears-ahead-of-time-#6348' into develop