Fixed configuration
Merge branch 'develop'