Merge branch 'develop' into lbudginas/healthchecker_updates