Fixing dependency handling.
Merge