Merge branch 'hotfix/Test' into develop
Doc version update
Merge branch 'develop'