closes #23438