Unnecessary debug code removed.
Merge branch 'release/0.9.7' into develop