Add separate debug logger
Merge branch 'develop'