Removed debug
Merge branch 'master' into nextdev