Cleaning configs
Merge branch 'develop' into asset