Resetting log level to debug for development
Some hotfixes
Merge branch 'development'