Merge branch 'dev'. Make debug log calls better