significant changes for VIVO-131. See Jira comment for more details