Correct some errors in previous non-threaded changes. With these changes unit tests in non-threaded versions pass again. Related to [GL #4424] and [GL #4459], fixup of !8786.
Correct some errors in previous non-threaded changes. With these changes unit tests in non-threaded versions pass again. Related to [GL #4424] and [GL #4459], fixup of !8786.