VIVO-425, VIVO-422 and VIVO-424
Merge branch 'maint-rel-1.6' into develop