moved to deferred from Q, updated dependencies