Suppress warnings
Merge branch 'develop'