Merge pull request #303 from hlim/master

CRAFTERCMS-912: disabled default dependency loading
CRAFTERCMS-811
Merge pull request #304 from rart/master

CRAFTERCMS-811