Merge tag 'backport/v3.18/vsp1-to-v4.0-rc1' into backport/v3.18.8/snapshot.wip