Remove debug trace
Merge branch 'develop'