updates for VIVO-401 and VIVO-418 which were related issues
Merge branch 'maint-rel-1.6' into develop