Merge branch 'vsp1/pa-improvements' into vsp1/next