Pull in non-essential parts of the V2P patch.