Updating supported versions
Updating supported versions
Merge branch 'develop'