(cherry picked from commit 11b1cbec) (cherry picked from commit 5b5bebee)
mentioned in issue #1852 (closed)
mentioned in issue #1853 (closed)