Gh 738

Basically this just pulls in an integration repo update, but there's also a unittest change.