Next attempt of rebase test
Rebased from steffengy/VirtualPack@cb5c9a7e179e250eff5b37fb3de6cf300daa71b2