Fixes issues with dependency checking
Merge remote-tracking branch 'origin/master'