VIVO-518 and some other cleanup
Merge branch 'maint-rel-1.6' into develop