4.1 dev - Update changes

The last fix in this set of changes fixes a problem where parallel jobs get stuck.