Issue #2632 was fixed.
(cherry picked from commit 7830a4d)