Merge "Add additional logging to test 1940"