Merge branch 'master' into develop
Try to fix issues
Merge branch 'develop'
Removed debug text