Set asset config to true
Merge branch 'develop' into it