Merge branch 'issue#41' into 'dev-v3.5.1'

issue #41 IFA011ed351 updates related to the use of VIPs

See merge request !96
1 job for dev-v3.5.1 in 0 seconds (queued for 23 seconds)