Fix for 1507
Removed additional output in debug mode
Merge branch 'daniel_1507_fix' into next
Merge branch 'next' into sam_97_alt