Merge "fix API inconsistency in ext VLs"