Related to #1359
mentioned in issue #1352 (closed)
mentioned in issue #1353
mentioned in commit 24f760e4