Added scenario to test complex dependencies and fixed various issues that arose.
Merge remote-tracking branch 'origin/master'