Work on DOC-1408 (VPC)