Merge branch 'logger-configuration' into 'develop'