Merge commit 'f96dae19625f2c763a05699ef8c0c368e36747bc' into release
Added more debug info
Merge branch 'release'