Merge "Fix VDM intent interception matching." into main