VIVO-429 and VIVO-486
Merge branch 'maint-rel-1.6' into develop