Issue 40907