Merge branch 'hotfix/hotfix'
API documentation
GIT stash fix
Merge branch 'hotfix/hotfix' into develop