Changes made to more fully support multiple Rally/RTL points.