See issue summary for how to reproduce before this patch, then follow the same steps after applying this patch and you should no longer see the PHP notice.
Closes #3199565