Merge "Fix VPP linting"