Merge tag 'backport/v3.14/vsp1-to-v3.15' into HEAD