Commited the master dispatcher back to this branch in TRN-487a.