Merge pull request #3625 from ldir-EDB0/master