Finishing configuration
Merged 'develop'.