Merge pull request #1862 from Ansuel/lucidep