Update configuration
Merge branch 'develop'
Fix shared files
Merge branch 'develop'
Fix DG on master
Merge branch 'develop'
Fix shell commands
Fix some stuff