VIVO-400, VIVO-398 and VIVO-399
Merge branch 'maint-rel-1.6' into develop