Adressed warnings shown by static analysis.
Handle merge conflicts with PR297
Merge branch 'beliyd-dev/fix/warnings' into develop