(cherry picked from commit 2d4d1e54)
mentioned in issue #1030 (closed)
mentioned in issue #1260 (closed)