aligned to latest changes in Virtual Repository