VIVO-621
Merge branch 'maint-rel-1.6' into develop