VIVO-112 and VIVO-298
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf