Enable faker in development mode as well
Merge branch 'develop'