Merge pull request #609 from LNP-BP/refactor-deps