Hotfix for debugging functionality.
Merge branch 'V2'