Closes #15061 (cherry picked from commit 15dec9a76ca56930c6764e8483cbf4ce8aae4f90)
* Some cleanup Closes #15065
Closes #15064