Merge branch 'vsp1/debug' into vsp1/next.debug