Fix bug with CP VirtualDevice, comment a part of the code and waiting for a solution before commiting