Fixes
Merge https://github.com/desmovalvo/virtualsib-part2bis