[#1855] Removed debug statements.
Merge with master