Issue #8744 by tj, added links and