Integrate changes from @midpackrunner's fork.