Thanks to Andriy Sokolovskiy for the report and Tim Graham for the review.
mentioned in commit 522b0bc9