updates for VIVO-413 and VIVO-409