Merge pull request #1778 from ldir-EDB0/igdv2