Merge pull request #3347 from ldir-EDB0/staging