Issue 40707