Merge branch 'feature/fix-warnings' into 'develop'