Removed debug output.
Merge branch 'test' into dev
Fixed warnings.
Merge branch 'test' into dev