Issue # 1827 was fixed.
Merge remote-tracking branch 'origin/hotfix-1.6.1' into hotfix-1.6.1