Issue #1804 was fixed.
(cherry picked from commit 652a7a9)
Merge remote-tracking branch 'origin/hotfix-1.6.1' into hotfix-1.6.1