NXP-8854: move waiters in from dm to jsf