Solve merge conflict
Merge pull request #47 from FraGoTe/virtual

BT#8130