Merge "Fix build break with missing VDBG." into klp-dev