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