Periodic update from Intersect #2

Lloyd, can you pull up the changes so we can re-deploy at UWS?

Ta,
David