Updated unit tests for bug#7369.
Merge remote-tracking branch 'upstream/master'