Add test for 6813
Fix tests post #6782
Merge remote-tracking branch 'upstream/Master' into Windows