Merge branch 'develop' into lbudginas/#590_upgrade_next_version