Merge "Revert "More robust updating of "runnable" list."" into udc-dev