(cherry picked from commit ed10c9215f29b54b2a8120757d544960a1c5bbe8)
mentioned in issue #1741 (closed)