Merge pull request #3309 from ldir-EDB0/master