LPS-37951

Ray I think it might be better for you to take a look at this since you've been making changes to how we handle the setup lately and I haven't had time to catch up