Merge branch 'develop' into lbudginas/#432_build_warnings