Fix for #18994
Merge pull request #19025 from gravieinc/develop

Fix for #18994