Issue #1689 was fixed.
(cherry picked from commit 8f42c59)
Issue #1689 was fixed.
(cherry picked from commit bd5f47c)