fixes for VIVO-591, VIVO-592, VIVO-594, VIVO-597, VIVO-598 and VIVO-601
Merge branch 'maint-rel-1.6' into develop