updates for VIVO-401 and VIVO-418 which were related issues