Created attachment 8374 [details] Proposed fix
Pushed patch to autobuild-master.
Pushed to autobuild-v4-0-test.
Pushed to v4-0-test. Will be included in 4.0.1. Closing out bug report. Thanks!