Merge remote-tracking branch 'origin/4-add-dependencies' into 4-add-dependencies