this time, actually fix problems with loading some types of VIRS in saves
Merge branch 'origin/c++'