Issue #8744 by tj, extras added