Merge "Add more logging to test 1935"