Issue #1804 test failure was fixed.
(cherry picked from commit 989557c)