Issue 40785