Issue #1804 build failure was fixed.
(cherry picked from commit 9bc6c02)