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