Issue 40698