Uncommented some requires.
Merge branch 'develop'