VIVO-360, VIVO-359 and VIVO-345
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop