VIVO-42 support for union ranges and other related improvements