fixes #10965
mentioned in merge request !169 (closed)
mentioned in commit 1848a32e
mentioned in commit 2fe5b0f3