Merged branch 'dependenciesBranch'