Fixes #4961 Thanks for the report & patch!
Refs #4961 Another fix. Let me know if you still see notices/warnings related to this
Merge remote-tracking branch 'origin/master'